@mcp-ts/sdk 1.4.0 → 1.5.1

package/src/shared/tool-router.ts

@@ -0,0 +1,469 @@
+/**
+ * ToolRouter — Middleware layer for intelligent MCP tool selection.
+ *
+ * Sits between your AI framework adapter and MultiSessionClient to reduce
+ * context window usage. Supports three strategies:
+ *
+ *  • `all`    — Pass through every tool (backward-compatible default)
+ *  • `search` — Expose only meta-tools; LLM discovers tools on-demand
+ *  • `groups` — Expose tools from active groups only
+ *
+ * Inspired by Anthropic's `defer_loading` + `tool_search_tool` pattern.
+ *
+ * @example
+ * ```ts
+ * import { ToolRouter } from '@mcp-ts/sdk/shared';
+ * import { AIAdapter } from '@mcp-ts/sdk/adapters/ai';
+ *
+ * const router = new ToolRouter(multiSessionClient, {
+ *   strategy: 'search',
+ *   maxTools: 5,
+ * });
+ *
+ * const tools = await AIAdapter.getTools(multiSessionClient, { toolRouter: router });
+ * ```
+ *
+ * @packageDocumentation
+ */
+
+import type { Tool } from '@modelcontextprotocol/sdk/types.js';
+import type { ToolClient, ToolClientProvider } from './types.js';
+import { ToolIndex, type IndexedTool, type ToolSummary, type EmbedFn } from './tool-index.js';
+import { SchemaCompressor, type CompactTool } from './schema-compressor.js';
+import {
+  createSearchToolDefinition,
+  createRegexSearchToolDefinition,
+  createGetSchemaToolDefinition,
+  createExecuteToolDefinition,
+} from './meta-tools.js';
+
+// ---------------------------------------------------------------------------
+// Types
+// ---------------------------------------------------------------------------
+
+export type ToolRouterStrategy = 'all' | 'search' | 'groups';
+
+export interface ToolRouterOptions {
+  /**
+   * Strategy for tool selection.
+   *
+   *  • `all`    — Expose all tools (default, backward-compatible)
+   *  • `search` — Expose only meta-tools; LLM discovers real tools via search
+   *  • `groups` — Expose only tools from active groups
+   *
+   * @default 'all'
+   */
+  strategy?: ToolRouterStrategy;
+
+  /**
+   * Maximum tools to expose to the LLM at once.
+   * Only applies to `groups` strategy and search results.
+   * @default 40
+   */
+  maxTools?: number;
+
+  /**
+   * Tool groups configuration — map of group name to tool names.
+   * When not provided, groups are auto-generated from server names.
+   *
+   * @example
+   * ```ts
+   * groups: {
+   *   database: ['query_db', 'list_tables', 'describe_table'],
+   *   github: ['create_pr', 'list_issues', 'search_code'],
+   * }
+   * ```
+   */
+  groups?: Record<string, string[]>;
+
+  /**
+   * Active groups (when `strategy='groups'`).
+   * Only tools in these groups are exposed. Empty = all groups active.
+   */
+  activeGroups?: string[];
+
+  /**
+   * Whether to use compact schemas (name + description + parameterHint only, no inputSchema).
+   * Reduces token usage but requires 2-turn flow: LLM picks tool → get schema → call.
+   * @default false
+   */
+  compactSchemas?: boolean;
+
+  /**
+   * Optional embedding function for semantic search.
+   * When not provided, keyword TF-IDF matching is used.
+   */
+  embedFn?: EmbedFn;
+
+  /**
+   * Weight of keyword score vs embedding score (0–1).
+   * Only relevant when `embedFn` is provided.
+   * @default 0.4
+   */
+  keywordWeight?: number;
+}
+
+/** Information about a tool group. */
+export interface ToolGroupInfo {
+  tools: string[];
+  active: boolean;
+}
+
+// ---------------------------------------------------------------------------
+// Client Input Types
+// ---------------------------------------------------------------------------
+
+/**
+ * Accepted client input for ToolRouter.
+ * Pass a `ToolClientProvider` (e.g. MultiSessionClient), or an array of `ToolClient` instances.
+ */
+export type ToolRouterClientInput = ToolClientProvider | ToolClient[];
+
+// ---------------------------------------------------------------------------
+// ToolRouter
+// ---------------------------------------------------------------------------
+
+export class ToolRouter {
+  private index: ToolIndex;
+  private allTools: IndexedTool[] = [];
+  private groupsMap = new Map<string, ToolGroupInfo>();
+  private strategy: ToolRouterStrategy;
+  private maxTools: number;
+  private compactSchemas: boolean;
+  private activeGroups: Set<string>;
+  private customGroups?: Record<string, string[]>;
+  private initialized = false;
+
+  constructor(
+    private client: ToolRouterClientInput,
+    private options: ToolRouterOptions = {}
+  ) {
+    this.strategy = options.strategy ?? 'all';
+    this.maxTools = options.maxTools ?? 40;
+    this.compactSchemas = options.compactSchemas ?? false;
+    this.activeGroups = new Set(options.activeGroups ?? []);
+    this.customGroups = options.groups;
+
+    this.index = new ToolIndex({
+      embedFn: options.embedFn,
+      keywordWeight: options.keywordWeight,
+    });
+  }
+
+  // -----------------------------------------------------------------------
+  // Core Public API
+  // -----------------------------------------------------------------------
+
+  /**
+   * Get tools filtered by the current strategy.
+   * This is the main method adapters should call.
+   *
+   * - `all`    → returns all tools (unchanged behavior)
+   * - `search` → returns only meta-tools (mcp_search_tool_bm25, mcp_get_tool_schema, mcp_execute_tool)
+   * - `groups` → returns tools from active groups only
+   */
+  async getFilteredTools(): Promise<Tool[]> {
+    await this.ensureInitialized();
+
+    switch (this.strategy) {
+      case 'search':
+        return this.getMetaToolDefinitions();
+
+      case 'groups':
+        return this.getGroupFilteredTools();
+
+      case 'all':
+      default:
+        if (this.compactSchemas) {
+          // Return tools with inputSchema stripped
+          return this.allTools.map((t) => {
+            const compact = SchemaCompressor.toCompact(t);
+            return {
+              name: compact.name,
+              description:
+                (compact.description ?? '') +
+                (compact.parameterHint ? ` Parameters: ${compact.parameterHint}` : ''),
+              inputSchema: { type: 'object' as const, properties: {} },
+            };
+          });
+        }
+        return [...this.allTools];
+    }
+  }
+
+  /**
+   * Search tools by natural-language query.
+   * Works regardless of strategy.
+   */
+  async searchTools(query: string, topK?: number): Promise<ToolSummary[]> {
+    await this.ensureInitialized();
+    return this.index.search(query, topK ?? this.maxTools);
+  }
+
+  /**
+   * Search tools by regex pattern.
+   * Matches against name, description, and parameter metadata.
+   */
+  async searchToolsRegex(pattern: string, topK?: number): Promise<ToolSummary[]> {
+    await this.ensureInitialized();
+    return this.index.searchRegex(pattern, topK ?? this.maxTools);
+  }
+
+  /**
+   * Get the full tool definition by name.
+   * If tool name is ambiguous, use namespace to specify the server.
+   */
+  getToolSchema(toolName: string, namespace?: string): IndexedTool | undefined {
+    const matches = this.index.getTool(toolName, namespace);
+
+    if (matches.length === 0) return undefined;
+
+    if (matches.length > 1) {
+      const servers = matches.map((m) => m.serverName).join(', ');
+      throw new Error(
+        `Tool "${toolName}" is provided by multiple servers: [${servers}]. ` +
+          `Please specify the desired "serverName" as a namespace.`
+      );
+    }
+
+    return matches[0];
+  }
+
+  /**
+   * Get compact (schema-less) summaries for all tools.
+   */
+  getCompactTools(): CompactTool[] {
+    return SchemaCompressor.compactAll(this.allTools);
+  }
+
+  // -----------------------------------------------------------------------
+  // Group Management
+  // -----------------------------------------------------------------------
+
+  /** Get all available groups with their tool lists and active status. */
+  getGroups(): Map<string, ToolGroupInfo> {
+    return new Map(this.groupsMap);
+  }
+
+  /** Activate specific groups. Pass empty array to activate all. */
+  setActiveGroups(groups: string[]): void {
+    this.activeGroups = new Set(groups);
+    // Update groupsMap active flags
+    for (const [name, info] of this.groupsMap) {
+      info.active = this.activeGroups.size === 0 || this.activeGroups.has(name);
+    }
+  }
+
+  /** Get the names of currently active groups. */
+  getActiveGroups(): string[] {
+    return [...this.activeGroups];
+  }
+
+  // -----------------------------------------------------------------------
+  // Stats & Introspection
+  // -----------------------------------------------------------------------
+
+  /** Total token cost of all tools if loaded without filtering. */
+  getTotalTokenCost(): number {
+    return this.index.getTotalTokenCost();
+  }
+
+  /** Estimate token cost of the currently filtered tool set. */
+  async getFilteredTokenCost(): Promise<number> {
+    const tools = await this.getFilteredTools();
+    let total = 0;
+    for (const tool of tools) {
+      total += ToolIndex.estimateTokens(tool);
+    }
+    return total;
+  }
+
+  /** Get compression stats showing savings from current strategy. */
+  getCompressionStats() {
+    return SchemaCompressor.estimateSavings(this.allTools);
+  }
+
+  /** Number of total indexed tools. */
+  get totalToolCount(): number {
+    return this.allTools.length;
+  }
+
+  /** Change strategy at runtime. */
+  setStrategy(strategy: ToolRouterStrategy): void {
+    this.strategy = strategy;
+  }
+
+  /**
+   * Force a re-index of tools from all connected clients.
+   * Call this after adding/removing MCP server connections.
+   */
+  async refresh(): Promise<void> {
+    this.initialized = false;
+    await this.ensureInitialized();
+  }
+
+  /**
+   * Execute a tool by routing to the correct MCP client.
+   * Used by the `mcp_execute_tool` meta-tool to proxy tool calls.
+   */
+  async callTool(
+    toolName: string,
+    args: Record<string, unknown>,
+    namespace?: string
+  ): Promise<any> {
+    await this.ensureInitialized();
+
+    const indexedTool = this.getToolSchema(toolName, namespace);
+    if (!indexedTool) {
+      throw new Error(
+        `Tool "${toolName}" not found${
+          namespace ? ` on server "${namespace}"` : ''
+        }. Use mcp_search_tool_bm25 or mcp_search_tool_regex to discover available tools.`
+      );
+    }
+
+    const clients = this.getClients();
+    const targetClient =
+      clients.find(
+        (c) =>
+          typeof c.getSessionId === 'function' &&
+          c.getSessionId() === indexedTool.sessionId
+      ) ?? clients.find((c) => c.isConnected());
+
+    if (!targetClient) {
+      throw new Error(`No connected client found for tool "${toolName}"`);
+    }
+
+    return await targetClient.callTool(toolName, args);
+  }
+
+  // -----------------------------------------------------------------------
+  // Internals
+  // -----------------------------------------------------------------------
+
+  /** Lazy initialization — fetches tools from all connected clients. */
+  private async ensureInitialized(): Promise<void> {
+    if (this.initialized) return;
+
+    this.allTools = await this.fetchAllTools();
+    await this.index.buildIndex(this.allTools);
+    this.buildGroups();
+    this.initialized = true;
+  }
+
+  /** Fetch tools from all connected MCP clients. */
+  private async fetchAllTools(): Promise<IndexedTool[]> {
+    const clients = this.getClients();
+    const result: IndexedTool[] = [];
+
+    for (const client of clients) {
+      if (!client.isConnected()) continue;
+
+      try {
+        const { tools } = await client.listTools();
+        const serverId =
+          typeof client.getServerId === 'function' ? client.getServerId() ?? 'unknown' : 'unknown';
+        const serverName =
+          (typeof client.getServerName === 'function' ? client.getServerName() : undefined) ??
+          serverId;
+        const sessionId =
+          typeof client.getSessionId === 'function' ? client.getSessionId() ?? 'unknown' : 'unknown';
+
+        for (const tool of tools) {
+          result.push({
+            ...tool,
+            serverName: serverName,
+            sessionId,
+          });
+        }
+      } catch (err) {
+        console.warn('[ToolRouter] Failed to fetch tools from client:', err);
+      }
+    }
+
+    return result;
+  }
+
+  /** Resolve the client input to a flat array of ToolClient instances. */
+  private getClients(): ToolClient[] {
+    if (Array.isArray(this.client)) {
+      return this.client;
+    }
+    if (typeof (this.client as ToolClientProvider).getClients === 'function') {
+      return (this.client as ToolClientProvider).getClients();
+    }
+    // Single client
+    return [this.client as unknown as ToolClient];
+  }
+
+  /** Build group map from custom config or auto-detect from server names. */
+  private buildGroups(): void {
+    this.groupsMap.clear();
+
+    if (this.customGroups) {
+      // Explicit groups
+      for (const [name, tools] of Object.entries(this.customGroups)) {
+        this.groupsMap.set(name, {
+          tools,
+          active: this.activeGroups.size === 0 || this.activeGroups.has(name),
+        });
+      }
+    } else {
+      // Auto-group by server name
+      const serverTools = new Map<string, string[]>();
+      for (const tool of this.allTools) {
+        const group = tool.serverName;
+        if (!serverTools.has(group)) {
+          serverTools.set(group, []);
+        }
+        serverTools.get(group)!.push(tool.name);
+      }
+
+      for (const [serverName, tools] of serverTools) {
+        this.groupsMap.set(serverName, {
+          tools,
+          active: this.activeGroups.size === 0 || this.activeGroups.has(serverName),
+        });
+      }
+    }
+  }
+
+  /** Return only tools belonging to currently active groups. */
+  private getGroupFilteredTools(): Tool[] {
+    const activeToolNames = new Set<string>();
+    for (const [, info] of this.groupsMap) {
+      if (info.active) {
+        for (const name of info.tools) {
+          activeToolNames.add(name);
+        }
+      }
+    }
+
+    const filtered = this.allTools.filter((t) => activeToolNames.has(t.name));
+
+    if (this.compactSchemas) {
+      return filtered.slice(0, this.maxTools).map((t) => {
+        const compact = SchemaCompressor.toCompact(t);
+        return {
+          name: compact.name,
+          description:
+            (compact.description ?? '') +
+            (compact.parameterHint ? ` Parameters: ${compact.parameterHint}` : ''),
+          inputSchema: { type: 'object' as const, properties: {} },
+        };
+      });
+    }
+
+    return filtered.slice(0, this.maxTools);
+  }
+
+  /** The 4 meta-tool definitions exposed in `search` strategy. */
+  private getMetaToolDefinitions(): Tool[] {
+    return [
+      createSearchToolDefinition(),
+      createRegexSearchToolDefinition(),
+      createGetSchemaToolDefinition(),
+      createExecuteToolDefinition(),
+    ];
+  }
+}

package/src/shared/types.ts

@@ -4,6 +4,36 @@
 
 import { Tool, CallToolResult } from '@modelcontextprotocol/sdk/types.js';
 
+// ---------------------------------------------------------------------------
+// Core Capability Interfaces
+// ---------------------------------------------------------------------------
+
+/**
+ * A client that can list and execute MCP tools.
+ *
+ * This is the structural interface that `ToolRouter`, adapters, and other
+ * consumers use to interact with any MCP client implementation.
+ * Both `MCPClient` and `createMcpClient()` satisfy this interface.
+ */
+export interface ToolClient {
+  isConnected(): boolean;
+  listTools(): Promise<{ tools: Tool[] }>;
+  callTool(name: string, args: Record<string, unknown>): Promise<any>;
+  getServerId?(): string | undefined;
+  getServerName?(): string | undefined;
+  getSessionId?(): string;
+}
+
+/**
+ * A provider that manages multiple `ToolClient` instances.
+ *
+ * `MultiSessionClient` satisfies this interface. Pass it directly
+ * to `ToolRouter` or adapters to aggregate tools from all connected servers.
+ */
+export interface ToolClientProvider {
+  getClients(): ToolClient[];
+}
+
 // Connect API types
 export interface ConnectRequest {
   serverUrl: string;

package/supabase/migrations/20260421010000_add_session_cleanup_cron.sql

@@ -0,0 +1,32 @@
+-- Enable the pg_cron extension (available on all Supabase plans).
+-- This is idempotent and safe to run multiple times.
+CREATE EXTENSION IF NOT EXISTS pg_cron;
+
+-- ─────────────────────────────────────────────────────────────────────────────
+-- Stage 1: Short-term Transient Purge (every 5 minutes)
+-- ─────────────────────────────────────────────────────────────────────────────
+-- Targets sessions that are NOT active (failed connections, abandoned OAuth
+-- flows, mid-flow errors) whose TTL has expired. Active sessions are explicitly
+-- excluded from this sweep to preserve automation credentials.
+--
+-- The idx_mcp_sessions_expires_at index ensures this is a fast indexed scan.
+SELECT cron.schedule(
+    'cleanup-transient-sessions',
+    '*/5 * * * *',
+    $$DELETE FROM public.mcp_sessions WHERE expires_at < now() AND active IS NOT TRUE;$$
+);
+
+-- ─────────────────────────────────────────────────────────────────────────────
+-- Stage 2: Long-term Dormancy Eviction (daily at midnight UTC)
+-- ─────────────────────────────────────────────────────────────────────────────
+-- Safety net for sessions that were successfully established (active = true)
+-- but have been completely untouched for 30+ days. This prevents "active"
+-- records from persisting indefinitely if they are genuinely abandoned.
+SELECT cron.schedule(
+    'cleanup-dormant-sessions',
+    '0 0 * * *',
+    $$DELETE FROM public.mcp_sessions WHERE active = true AND updated_at < now() - interval '30 days';$$
+);
+
+-- Add a comment on the extension for visibility in Supabase Dashboard
+COMMENT ON EXTENSION pg_cron IS 'Automated Session Lifecycle Management.';