@mcp-ts/sdk 1.6.1 → 2.0.0

package/dist/{multi-session-client-CHE8QpVE.d.ts → multi-session-client-BYtguGJm.d.ts}

@@ -22,7 +22,7 @@ interface AgentsOAuthProvider extends OAuthClientProvider {
     setTokenExpiresAt(expiresAt: number): void;
 }
 interface StorageOAuthClientProviderOptions {
-    identity: string;
+    userId: string;
     serverId: string;
     sessionId: string;
     redirectUrl: string;
@@ -36,10 +36,10 @@ interface StorageOAuthClientProviderOptions {
 }
 /**
  * Storage-backed OAuth provider implementation for MCP
- * Stores OAuth tokens, client information, and PKCE verifiers using the configured StorageBackend
+ * Stores OAuth tokens, client information, and PKCE verifiers using the configured SessionStore
  */
 declare class StorageOAuthClientProvider implements AgentsOAuthProvider {
-    readonly identity: string;
+    readonly userId: string;
     readonly serverId: string;
     readonly sessionId: string;
     readonly redirectUrl: string;
@@ -53,7 +53,7 @@ declare class StorageOAuthClientProvider implements AgentsOAuthProvider {
     private onRedirectCallback?;
     private tokenExpiresAt?;
     /**
-     * Creates a new storage-backed OAuth provider
+     * Creates a new session-backed OAuth provider
      * @param options - Provider configuration
      */
     constructor(options: StorageOAuthClientProviderOptions);
@@ -61,12 +61,12 @@ declare class StorageOAuthClientProvider implements AgentsOAuthProvider {
     get clientId(): string | undefined;
     set clientId(clientId_: string | undefined);
     /**
-     * Loads OAuth data from storage session
+     * Loads OAuth data from the session store
      * @private
      */
     private getSessionData;
     /**
-     * Saves OAuth data to storage
+     * Saves OAuth data to the session store
      * @param data - Partial OAuth data to save
      * @private
      * @throws Error if session doesn't exist (session must be created by controller layer)
@@ -105,13 +105,13 @@ declare class StorageOAuthClientProvider implements AgentsOAuthProvider {
 /**
  * Supported MCP transport types
  */
-type TransportType = 'sse' | 'streamable_http';
+type TransportType = 'sse' | 'streamable-http';
 interface MCPOAuthClientOptions {
     serverUrl?: string;
     serverName?: string;
     callbackUrl?: string;
     onRedirect?: (url: string) => void;
-    identity: string;
+    userId: string;
     serverId?: string; /** Optional - loaded from session if not provided */
     sessionId: string; /** Required - primary key for session lookup */
     transportType?: TransportType;
@@ -133,7 +133,7 @@ declare class MCPClient {
     private client;
     oauthProvider: AgentsOAuthProvider | null;
     private transport;
-    private identity;
+    private userId;
     private serverId?;
     private sessionId;
     private serverName?;
@@ -158,7 +158,7 @@ declare class MCPClient {
     private currentState;
     /**
      * Creates a new MCP client instance
-     * Can be initialized with minimal options (identity + sessionId) for session restoration
+     * Can be initialized with minimal options (userId + sessionId) for session restoration
      * @param options - Client configuration options
      */
     constructor(options: MCPOAuthClientOptions);
@@ -196,7 +196,7 @@ declare class MCPClient {
      */
     private initialize;
     /**
-     * Saves current session state to storage
+     * Saves current session state to the session store
      * Creates new session if it doesn't exist, updates if it does
      * @param ttl - Time-to-live in seconds (defaults to 12hr for connected sessions)
      * @param active - Session status marker used to avoid unnecessary TTL rewrites
@@ -316,7 +316,7 @@ declare class MCPClient {
     getCallbackUrl(): string;
     /**
      * Gets the transport type being used
-     * @returns Transport type (defaults to 'streamable_http')
+     * @returns Transport type (defaults to 'streamable-http')
      */
     getTransportType(): TransportType;
     /**
@@ -338,15 +338,15 @@ declare class MCPClient {
      * Gets MCP server configuration for all active user sessions
      * Loads sessions from Redis, validates OAuth tokens, refreshes if expired
      * Returns ready-to-use configuration with valid auth headers
-     * @param identity - User ID to fetch sessions for
+     * @param userId - User ID to fetch sessions for
      * @returns Object keyed by sanitized server labels containing transport, url, headers, etc.
      * @static
      */
-    static getMcpServerConfig(identity: string): Promise<Record<string, any>>;
+    static getMcpServerConfig(userId: string): Promise<Record<string, any>>;
 }
 
 /**
- * Manages multiple MCP connections for a single user identity.
+ * Manages multiple MCP connections for a single user.
  * Allows aggregating tools from all connected servers.
  */
 interface MultiSessionOptions {
@@ -367,7 +367,7 @@ interface MultiSessionOptions {
     retryDelay?: number;
 }
 /**
- * Manages multiple MCP client connections for a single user identity.
+ * Manages multiple MCP client connections for a single user.
  *
  * On a traditional long-running server, you can cache this instance per user
  * so the connections stay alive between requests. On serverless, a new instance
@@ -376,18 +376,18 @@ interface MultiSessionOptions {
  */
 declare class MultiSessionClient {
     private clients;
-    private identity;
+    private userId;
     private options;
     /**
-     * Creates a new MultiSessionClient for the given user identity.
+     * Creates a new MultiSessionClient for the given user userId.
      *
-     * @param identity - A unique string identifying the user (e.g. user ID or email).
+     * @param userId - A unique string identifying the user (e.g. user ID or email).
      * @param options  - Optional tuning for connection timeout, retry count, and retry delay.
      *                   Falls back to sensible defaults if not provided.
      */
-    constructor(identity: string, options?: MultiSessionOptions);
+    constructor(userId: string, options?: MultiSessionOptions);
     /**
-     * Fetches all sessions for this identity from storage and returns only the
+     * Fetches all sessions for this userId from storage and returns only the
      * ones that are ready to connect.
      *
      * A session is considered connectable when:
@@ -436,7 +436,7 @@ declare class MultiSessionClient {
      */
     private establishConnectionWithRetries;
     /**
-     * The main entry point. Fetches all active sessions for this identity from
+     * The main entry point. Fetches all active sessions for this userId from
      * storage and establishes connections to all of them in batches.
      *
      * Call this once after creating the client. On traditional servers, you can

package/dist/{multi-session-client-CQsRbxYI.d.mts → multi-session-client-DYNe6az3.d.mts}

@@ -22,7 +22,7 @@ interface AgentsOAuthProvider extends OAuthClientProvider {
     setTokenExpiresAt(expiresAt: number): void;
 }
 interface StorageOAuthClientProviderOptions {
-    identity: string;
+    userId: string;
     serverId: string;
     sessionId: string;
     redirectUrl: string;
@@ -36,10 +36,10 @@ interface StorageOAuthClientProviderOptions {
 }
 /**
  * Storage-backed OAuth provider implementation for MCP
- * Stores OAuth tokens, client information, and PKCE verifiers using the configured StorageBackend
+ * Stores OAuth tokens, client information, and PKCE verifiers using the configured SessionStore
  */
 declare class StorageOAuthClientProvider implements AgentsOAuthProvider {
-    readonly identity: string;
+    readonly userId: string;
     readonly serverId: string;
     readonly sessionId: string;
     readonly redirectUrl: string;
@@ -53,7 +53,7 @@ declare class StorageOAuthClientProvider implements AgentsOAuthProvider {
     private onRedirectCallback?;
     private tokenExpiresAt?;
     /**
-     * Creates a new storage-backed OAuth provider
+     * Creates a new session-backed OAuth provider
      * @param options - Provider configuration
      */
     constructor(options: StorageOAuthClientProviderOptions);
@@ -61,12 +61,12 @@ declare class StorageOAuthClientProvider implements AgentsOAuthProvider {
     get clientId(): string | undefined;
     set clientId(clientId_: string | undefined);
     /**
-     * Loads OAuth data from storage session
+     * Loads OAuth data from the session store
      * @private
      */
     private getSessionData;
     /**
-     * Saves OAuth data to storage
+     * Saves OAuth data to the session store
      * @param data - Partial OAuth data to save
      * @private
      * @throws Error if session doesn't exist (session must be created by controller layer)
@@ -105,13 +105,13 @@ declare class StorageOAuthClientProvider implements AgentsOAuthProvider {
 /**
  * Supported MCP transport types
  */
-type TransportType = 'sse' | 'streamable_http';
+type TransportType = 'sse' | 'streamable-http';
 interface MCPOAuthClientOptions {
     serverUrl?: string;
     serverName?: string;
     callbackUrl?: string;
     onRedirect?: (url: string) => void;
-    identity: string;
+    userId: string;
     serverId?: string; /** Optional - loaded from session if not provided */
     sessionId: string; /** Required - primary key for session lookup */
     transportType?: TransportType;
@@ -133,7 +133,7 @@ declare class MCPClient {
     private client;
     oauthProvider: AgentsOAuthProvider | null;
     private transport;
-    private identity;
+    private userId;
     private serverId?;
     private sessionId;
     private serverName?;
@@ -158,7 +158,7 @@ declare class MCPClient {
     private currentState;
     /**
      * Creates a new MCP client instance
-     * Can be initialized with minimal options (identity + sessionId) for session restoration
+     * Can be initialized with minimal options (userId + sessionId) for session restoration
      * @param options - Client configuration options
      */
     constructor(options: MCPOAuthClientOptions);
@@ -196,7 +196,7 @@ declare class MCPClient {
      */
     private initialize;
     /**
-     * Saves current session state to storage
+     * Saves current session state to the session store
      * Creates new session if it doesn't exist, updates if it does
      * @param ttl - Time-to-live in seconds (defaults to 12hr for connected sessions)
      * @param active - Session status marker used to avoid unnecessary TTL rewrites
@@ -316,7 +316,7 @@ declare class MCPClient {
     getCallbackUrl(): string;
     /**
      * Gets the transport type being used
-     * @returns Transport type (defaults to 'streamable_http')
+     * @returns Transport type (defaults to 'streamable-http')
      */
     getTransportType(): TransportType;
     /**
@@ -338,15 +338,15 @@ declare class MCPClient {
      * Gets MCP server configuration for all active user sessions
      * Loads sessions from Redis, validates OAuth tokens, refreshes if expired
      * Returns ready-to-use configuration with valid auth headers
-     * @param identity - User ID to fetch sessions for
+     * @param userId - User ID to fetch sessions for
      * @returns Object keyed by sanitized server labels containing transport, url, headers, etc.
      * @static
      */
-    static getMcpServerConfig(identity: string): Promise<Record<string, any>>;
+    static getMcpServerConfig(userId: string): Promise<Record<string, any>>;
 }
 
 /**
- * Manages multiple MCP connections for a single user identity.
+ * Manages multiple MCP connections for a single user.
  * Allows aggregating tools from all connected servers.
  */
 interface MultiSessionOptions {
@@ -367,7 +367,7 @@ interface MultiSessionOptions {
     retryDelay?: number;
 }
 /**
- * Manages multiple MCP client connections for a single user identity.
+ * Manages multiple MCP client connections for a single user.
  *
  * On a traditional long-running server, you can cache this instance per user
  * so the connections stay alive between requests. On serverless, a new instance
@@ -376,18 +376,18 @@ interface MultiSessionOptions {
  */
 declare class MultiSessionClient {
     private clients;
-    private identity;
+    private userId;
     private options;
     /**
-     * Creates a new MultiSessionClient for the given user identity.
+     * Creates a new MultiSessionClient for the given user userId.
      *
-     * @param identity - A unique string identifying the user (e.g. user ID or email).
+     * @param userId - A unique string identifying the user (e.g. user ID or email).
      * @param options  - Optional tuning for connection timeout, retry count, and retry delay.
      *                   Falls back to sensible defaults if not provided.
      */
-    constructor(identity: string, options?: MultiSessionOptions);
+    constructor(userId: string, options?: MultiSessionOptions);
     /**
-     * Fetches all sessions for this identity from storage and returns only the
+     * Fetches all sessions for this userId from storage and returns only the
      * ones that are ready to connect.
      *
      * A session is considered connectable when:
@@ -436,7 +436,7 @@ declare class MultiSessionClient {
      */
     private establishConnectionWithRetries;
     /**
-     * The main entry point. Fetches all active sessions for this identity from
+     * The main entry point. Fetches all active sessions for this userId from
      * storage and establishes connections to all of them in batches.
      *
      * Call this once after creating the client. On traditional servers, you can

package/dist/server/index.d.mts

@@ -1,23 +1,23 @@
-export { M as MCPClient, a as MultiSessionClient, S as StorageOAuthClientProvider } from '../multi-session-client-CQsRbxYI.mjs';
-export { U as UnauthorizedError, s as sanitizeServerLabel } from '../utils-0qmYrqoa.mjs';
+export { M as MCPClient, a as MultiSessionClient, S as StorageOAuthClientProvider } from '../multi-session-client-DYNe6az3.mjs';
+export { U as UnauthorizedError, s as sanitizeServerLabel } from '../utils-DELRKQPU.mjs';
 import { OAuthClientInformationMixed, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
 export { OAuthClientInformation, OAuthClientInformationFull, OAuthClientMetadata, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
 import { M as McpConnectionEvent, d as McpObservabilityEvent } from '../events-CK3N--3g.mjs';
 export { D as Disposable, E as Emitter, b as Event, c as McpConnectionState } from '../events-CK3N--3g.mjs';
-import { q as McpRpcResponse, p as McpRpcRequest } from '../types-rIuN1CQi.mjs';
-export { a as CallToolRequest, b as CallToolResponse, f as ConnectRequest, g as ConnectResponse, m as ListToolsResponse, T as ToolClient, u as ToolClientProvider, v as ToolInfo } from '../types-rIuN1CQi.mjs';
+import { r as McpRpcResponse, q as McpRpcRequest } from '../types-BCAG20P6.mjs';
+export { a as CallToolRequest, b as CallToolResponse, f as ConnectRequest, g as ConnectResponse, n as ListToolsResponse, T as ToolClient, u as ToolClientProvider, v as ToolInfo } from '../types-BCAG20P6.mjs';
 export { CallToolResult, ListToolsResult, Tool } from '@modelcontextprotocol/sdk/types.js';
 import '@modelcontextprotocol/sdk/client/auth.js';
 
-interface SessionData {
+interface Session {
     sessionId: string;
     serverId?: string;
     serverName?: string;
     serverUrl: string;
-    transportType: 'sse' | 'streamable_http';
+    transportType: 'sse' | 'streamable-http';
     callbackUrl: string;
     createdAt: number;
-    identity: string;
+    userId: string;
     headers?: Record<string, string>;
     /**
      * Session status marker used for TTL transitions:
@@ -32,9 +32,9 @@ interface SessionData {
     clientId?: string;
 }
 /**
- * Interface for MCP Session Storage Backends
+ * Interface for MCP session stores.
  */
-interface StorageBackend {
+interface SessionStore {
     /**
      * Optional initialization (e.g., database connection)
      */
@@ -43,43 +43,40 @@ interface StorageBackend {
      * Generates a unique session ID
      */
     generateSessionId(): string;
-    /**
-     * Stores or updates a session
-     */
     /**
      * Creates a new session. Throws if session already exists.
      * @param session - Session data to create
      * @param ttl - Optional TTL in seconds (defaults to backend's default)
      */
-    createSession(session: SessionData, ttl?: number): Promise<void>;
+    create(session: Session, ttl?: number): Promise<void>;
     /**
      * Updates an existing session with partial data. Throws if session does not exist.
-     * @param identity - User identity
+     * @param userId - User identifier
      * @param sessionId - Session identifier
      * @param data - Partial session data to update
      * @param ttl - Optional TTL in seconds (defaults to backend's default)
      */
-    updateSession(identity: string, sessionId: string, data: Partial<SessionData>, ttl?: number): Promise<void>;
+    update(userId: string, sessionId: string, data: Partial<Session>, ttl?: number): Promise<void>;
     /**
      * Retrieves a session
      */
-    getSession(identity: string, sessionId: string): Promise<SessionData | null>;
+    get(userId: string, sessionId: string): Promise<Session | null>;
     /**
-     * Gets full session data for all of an identity's sessions
+     * Gets full session data for all sessions owned by a user
      */
-    getIdentitySessionsData(identity: string): Promise<SessionData[]>;
+    list(userId: string): Promise<Session[]>;
     /**
      * Removes a session
      */
-    removeSession(identity: string, sessionId: string): Promise<void>;
+    delete(userId: string, sessionId: string): Promise<void>;
     /**
-     * Gets all sessions IDs of an identity
+     * Gets all session IDs owned by a user
      */
-    getIdentityMcpSessions(identity: string): Promise<string[]>;
+    listIds(userId: string): Promise<string[]>;
     /**
      * Gets all session IDs across all users (Admin)
      */
-    getAllSessionIds(): Promise<string[]>;
+    listAllIds(): Promise<string[]>;
     /**
      * Clears all sessions (Admin)
      */
@@ -87,7 +84,7 @@ interface StorageBackend {
     /**
      * Clean up expired sessions
      */
-    cleanupExpiredSessions(): Promise<void>;
+    cleanupExpired(): Promise<void>;
     /**
      * Disconnect from storage backend
      */
@@ -98,7 +95,7 @@ interface StorageBackend {
  * Global session store instance
  * Uses lazy initialization with a Proxy to handle async setup transparently
  */
-declare const storage: StorageBackend;
+declare const sessions: SessionStore;
 
 /**
  * SSE (Server-Sent Events) Handler for MCP Connections
@@ -122,9 +119,9 @@ interface ClientMetadata {
 }
 interface SSEHandlerOptions {
     /** User/Client identifier */
-    identity: string;
+    userId: string;
     /** Optional callback for authentication/authorization */
-    onAuth?: (identity: string) => Promise<boolean>;
+    onAuth?: (userId: string) => Promise<boolean>;
     /** Heartbeat interval in milliseconds @default 30000 */
     heartbeatInterval?: number;
     /** Static OAuth client metadata defaults (for all connections) */
@@ -139,7 +136,7 @@ interface SSEHandlerOptions {
 declare class SSEConnectionManager {
     private readonly options;
     private readonly sendEvent;
-    private readonly identity;
+    private readonly userId;
     private readonly clients;
     private heartbeatTimer?;
     private isActive;
@@ -158,9 +155,9 @@ declare class SSEConnectionManager {
      */
     handleRequest(request: McpRpcRequest): Promise<McpRpcResponse>;
     /**
-     * Get all sessions for the current identity
+     * Get all sessions for the current userId
      */
-    private getSessions;
+    private listSessions;
     /**
      * Connect to an MCP server
      */
@@ -184,7 +181,7 @@ declare class SSEConnectionManager {
     /**
      * Restore and validate an existing session
      */
-    private restoreSession;
+    private getSession;
     /**
      * Complete OAuth authorization flow
      */
@@ -235,9 +232,9 @@ declare function createSSEHandler(options: SSEHandlerOptions): (req: {
 
 interface NextMcpHandlerOptions {
     /**
-     * Extract identity from request (default: from 'identity' query param)
+     * Extract userId from request (default: from 'userId' query param)
      */
-    getIdentity?: (request: Request) => string | null;
+    getUserId?: (request: Request) => string | null;
     /**
      * Extract auth token from request (default: from 'token' query param or Authorization header)
      */
@@ -246,7 +243,7 @@ interface NextMcpHandlerOptions {
      * Authenticate user and verify access (optional)
      * Return true if user is authenticated, false otherwise
      */
-    authenticate?: (identity: string, token: string | null) => Promise<boolean> | boolean;
+    authenticate?: (userId: string, token: string | null) => Promise<boolean> | boolean;
     /**
      * Heartbeat interval in milliseconds (default: 30000)
      */
@@ -265,4 +262,4 @@ declare function createNextMcpHandler(options?: NextMcpHandlerOptions): {
     POST: (request: Request) => Promise<Response>;
 };
 
-export { type ClientMetadata, McpConnectionEvent, McpObservabilityEvent, McpRpcRequest, McpRpcResponse, type NextMcpHandlerOptions, SSEConnectionManager, type SSEHandlerOptions, type StorageBackend, createNextMcpHandler, createSSEHandler, storage };
+export { type ClientMetadata, McpConnectionEvent, McpObservabilityEvent, McpRpcRequest, McpRpcResponse, type NextMcpHandlerOptions, SSEConnectionManager, type SSEHandlerOptions, type SessionStore, createNextMcpHandler, createSSEHandler, sessions };

package/dist/server/index.d.ts

@@ -1,23 +1,23 @@
-export { M as MCPClient, a as MultiSessionClient, S as StorageOAuthClientProvider } from '../multi-session-client-CHE8QpVE.js';
-export { U as UnauthorizedError, s as sanitizeServerLabel } from '../utils-0qmYrqoa.js';
+export { M as MCPClient, a as MultiSessionClient, S as StorageOAuthClientProvider } from '../multi-session-client-BYtguGJm.js';
+export { U as UnauthorizedError, s as sanitizeServerLabel } from '../utils-DELRKQPU.js';
 import { OAuthClientInformationMixed, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
 export { OAuthClientInformation, OAuthClientInformationFull, OAuthClientMetadata, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
 import { M as McpConnectionEvent, d as McpObservabilityEvent } from '../events-CK3N--3g.js';
 export { D as Disposable, E as Emitter, b as Event, c as McpConnectionState } from '../events-CK3N--3g.js';
-import { q as McpRpcResponse, p as McpRpcRequest } from '../types-rIuN1CQi.js';
-export { a as CallToolRequest, b as CallToolResponse, f as ConnectRequest, g as ConnectResponse, m as ListToolsResponse, T as ToolClient, u as ToolClientProvider, v as ToolInfo } from '../types-rIuN1CQi.js';
+import { r as McpRpcResponse, q as McpRpcRequest } from '../types-BCAG20P6.js';
+export { a as CallToolRequest, b as CallToolResponse, f as ConnectRequest, g as ConnectResponse, n as ListToolsResponse, T as ToolClient, u as ToolClientProvider, v as ToolInfo } from '../types-BCAG20P6.js';
 export { CallToolResult, ListToolsResult, Tool } from '@modelcontextprotocol/sdk/types.js';
 import '@modelcontextprotocol/sdk/client/auth.js';
 
-interface SessionData {
+interface Session {
     sessionId: string;
     serverId?: string;
     serverName?: string;
     serverUrl: string;
-    transportType: 'sse' | 'streamable_http';
+    transportType: 'sse' | 'streamable-http';
     callbackUrl: string;
     createdAt: number;
-    identity: string;
+    userId: string;
     headers?: Record<string, string>;
     /**
      * Session status marker used for TTL transitions:
@@ -32,9 +32,9 @@ interface SessionData {
     clientId?: string;
 }
 /**
- * Interface for MCP Session Storage Backends
+ * Interface for MCP session stores.
  */
-interface StorageBackend {
+interface SessionStore {
     /**
      * Optional initialization (e.g., database connection)
      */
@@ -43,43 +43,40 @@ interface StorageBackend {
      * Generates a unique session ID
      */
     generateSessionId(): string;
-    /**
-     * Stores or updates a session
-     */
     /**
      * Creates a new session. Throws if session already exists.
      * @param session - Session data to create
      * @param ttl - Optional TTL in seconds (defaults to backend's default)
      */
-    createSession(session: SessionData, ttl?: number): Promise<void>;
+    create(session: Session, ttl?: number): Promise<void>;
     /**
      * Updates an existing session with partial data. Throws if session does not exist.
-     * @param identity - User identity
+     * @param userId - User identifier
      * @param sessionId - Session identifier
      * @param data - Partial session data to update
      * @param ttl - Optional TTL in seconds (defaults to backend's default)
      */
-    updateSession(identity: string, sessionId: string, data: Partial<SessionData>, ttl?: number): Promise<void>;
+    update(userId: string, sessionId: string, data: Partial<Session>, ttl?: number): Promise<void>;
     /**
      * Retrieves a session
      */
-    getSession(identity: string, sessionId: string): Promise<SessionData | null>;
+    get(userId: string, sessionId: string): Promise<Session | null>;
     /**
-     * Gets full session data for all of an identity's sessions
+     * Gets full session data for all sessions owned by a user
      */
-    getIdentitySessionsData(identity: string): Promise<SessionData[]>;
+    list(userId: string): Promise<Session[]>;
     /**
      * Removes a session
      */
-    removeSession(identity: string, sessionId: string): Promise<void>;
+    delete(userId: string, sessionId: string): Promise<void>;
     /**
-     * Gets all sessions IDs of an identity
+     * Gets all session IDs owned by a user
      */
-    getIdentityMcpSessions(identity: string): Promise<string[]>;
+    listIds(userId: string): Promise<string[]>;
     /**
      * Gets all session IDs across all users (Admin)
      */
-    getAllSessionIds(): Promise<string[]>;
+    listAllIds(): Promise<string[]>;
     /**
      * Clears all sessions (Admin)
      */
@@ -87,7 +84,7 @@ interface StorageBackend {
     /**
      * Clean up expired sessions
      */
-    cleanupExpiredSessions(): Promise<void>;
+    cleanupExpired(): Promise<void>;
     /**
      * Disconnect from storage backend
      */
@@ -98,7 +95,7 @@ interface StorageBackend {
  * Global session store instance
  * Uses lazy initialization with a Proxy to handle async setup transparently
  */
-declare const storage: StorageBackend;
+declare const sessions: SessionStore;
 
 /**
  * SSE (Server-Sent Events) Handler for MCP Connections
@@ -122,9 +119,9 @@ interface ClientMetadata {
 }
 interface SSEHandlerOptions {
     /** User/Client identifier */
-    identity: string;
+    userId: string;
     /** Optional callback for authentication/authorization */
-    onAuth?: (identity: string) => Promise<boolean>;
+    onAuth?: (userId: string) => Promise<boolean>;
     /** Heartbeat interval in milliseconds @default 30000 */
     heartbeatInterval?: number;
     /** Static OAuth client metadata defaults (for all connections) */
@@ -139,7 +136,7 @@ interface SSEHandlerOptions {
 declare class SSEConnectionManager {
     private readonly options;
     private readonly sendEvent;
-    private readonly identity;
+    private readonly userId;
     private readonly clients;
     private heartbeatTimer?;
     private isActive;
@@ -158,9 +155,9 @@ declare class SSEConnectionManager {
      */
     handleRequest(request: McpRpcRequest): Promise<McpRpcResponse>;
     /**
-     * Get all sessions for the current identity
+     * Get all sessions for the current userId
      */
-    private getSessions;
+    private listSessions;
     /**
      * Connect to an MCP server
      */
@@ -184,7 +181,7 @@ declare class SSEConnectionManager {
     /**
      * Restore and validate an existing session
      */
-    private restoreSession;
+    private getSession;
     /**
      * Complete OAuth authorization flow
      */
@@ -235,9 +232,9 @@ declare function createSSEHandler(options: SSEHandlerOptions): (req: {
 
 interface NextMcpHandlerOptions {
     /**
-     * Extract identity from request (default: from 'identity' query param)
+     * Extract userId from request (default: from 'userId' query param)
      */
-    getIdentity?: (request: Request) => string | null;
+    getUserId?: (request: Request) => string | null;
     /**
      * Extract auth token from request (default: from 'token' query param or Authorization header)
      */
@@ -246,7 +243,7 @@ interface NextMcpHandlerOptions {
      * Authenticate user and verify access (optional)
      * Return true if user is authenticated, false otherwise
      */
-    authenticate?: (identity: string, token: string | null) => Promise<boolean> | boolean;
+    authenticate?: (userId: string, token: string | null) => Promise<boolean> | boolean;
     /**
      * Heartbeat interval in milliseconds (default: 30000)
      */
@@ -265,4 +262,4 @@ declare function createNextMcpHandler(options?: NextMcpHandlerOptions): {
     POST: (request: Request) => Promise<Response>;
 };
 
-export { type ClientMetadata, McpConnectionEvent, McpObservabilityEvent, McpRpcRequest, McpRpcResponse, type NextMcpHandlerOptions, SSEConnectionManager, type SSEHandlerOptions, type StorageBackend, createNextMcpHandler, createSSEHandler, storage };
+export { type ClientMetadata, McpConnectionEvent, McpObservabilityEvent, McpRpcRequest, McpRpcResponse, type NextMcpHandlerOptions, SSEConnectionManager, type SSEHandlerOptions, type SessionStore, createNextMcpHandler, createSSEHandler, sessions };