@mcp-ts/sdk 1.5.0 → 1.5.2

package/dist/index.js

@@ -1785,13 +1785,8 @@ var MCPClient = class _MCPClient {
       this.transportType = transportType;
       this.emitStateChange("CONNECTED");
       this.emitProgress("Connected successfully");
-      const existingSession = await storage.getSession(this.identity, this.sessionId);
-      const needsTransportUpdate = !existingSession || existingSession.transportType !== this.transportType;
-      const needsTtlPromotion = !existingSession || existingSession.active !== true;
-      if (needsTransportUpdate || needsTtlPromotion) {
-        console.log(`[MCPClient] Saving session ${this.sessionId} with 12hr TTL (connect success)`);
-        await this.saveSession(SESSION_TTL_SECONDS, true);
-      }
+      console.log(`[MCPClient] Saving session ${this.sessionId} with 12hr TTL (connect success)`);
+      await this.saveSession(SESSION_TTL_SECONDS, true);
     } catch (error) {
       if (error instanceof auth_js.UnauthorizedError || error instanceof Error && error.message.toLowerCase().includes("unauthorized")) {
         let authUrl = "";
@@ -1829,6 +1824,13 @@ var MCPClient = class _MCPClient {
       const errorMessage = error instanceof Error ? error.message : "Connection failed";
       this.emitError(errorMessage, "connection");
       this.emitStateChange("FAILED");
+      try {
+        const existingSession = await storage.getSession(this.identity, this.sessionId);
+        if (!existingSession || existingSession.active !== true) {
+          await storage.removeSession(this.identity, this.sessionId);
+        }
+      } catch {
+      }
       throw error;
     }
   }
@@ -1852,6 +1854,7 @@ var MCPClient = class _MCPClient {
     const transportsToTry = this.transportType ? [this.transportType] : ["streamable_http", "sse"];
     let lastError;
     let tokensExchanged = false;
+    let authenticatedStateEmitted = false;
     for (const currentType of transportsToTry) {
       const isLastAttempt = currentType === transportsToTry[transportsToTry.length - 1];
       try {
@@ -1863,8 +1866,10 @@ var MCPClient = class _MCPClient {
         } else {
           this.emitProgress(`Tokens already exchanged, skipping auth step for ${currentType}...`);
         }
-        this.transportType = currentType;
-        this.emitStateChange("AUTHENTICATED");
+        if (!authenticatedStateEmitted) {
+          this.emitStateChange("AUTHENTICATED");
+          authenticatedStateEmitted = true;
+        }
         this.emitProgress("Creating authenticated client...");
         this.client = new index_js.Client(
           {
@@ -1883,6 +1888,7 @@ var MCPClient = class _MCPClient {
         );
         this.emitStateChange("CONNECTING");
         await this.client.connect(this.transport);
+        this.transportType = currentType;
         this.emitStateChange("CONNECTED");
         console.log(`[MCPClient] Updating session ${this.sessionId} to 12hr TTL (OAuth complete)`);
         await this.saveSession(SESSION_TTL_SECONDS, true);
@@ -2754,9 +2760,23 @@ var SSEConnectionManager = class {
     if (existing) {
       return existing;
     }
+    const session = await storage.getSession(this.identity, sessionId);
+    if (!session) {
+      throw new Error("Session not found");
+    }
     const client = new MCPClient({
       identity: this.identity,
-      sessionId
+      sessionId,
+      // These fields are optional in MCPClient, but when rehydrating a known
+      // stored session on the server we pass them explicitly to preserve the
+      // original transport/connection metadata instead of relying on lazy
+      // reloading during initialize().
+      serverId: session.serverId,
+      serverName: session.serverName,
+      serverUrl: session.serverUrl,
+      callbackUrl: session.callbackUrl,
+      transportType: session.transportType,
+      headers: session.headers
     });
     client.onConnectionEvent((event) => this.emitConnectionEvent(event));
     client.onObservabilityEvent((event) => this.sendEvent(event));
@@ -2813,6 +2833,16 @@ var SSEConnectionManager = class {
       const client = new MCPClient({
         identity: this.identity,
         sessionId,
+        // These fields are optional in MCPClient, but when rehydrating a known
+        // stored session on the server we pass them explicitly to preserve the
+        // original transport/connection metadata instead of relying on lazy
+        // reloading during initialize().
+        serverId: session.serverId,
+        serverName: session.serverName,
+        serverUrl: session.serverUrl,
+        callbackUrl: session.callbackUrl,
+        transportType: session.transportType,
+        headers: session.headers,
         ...clientMetadata
       });
       client.onConnectionEvent((event) => this.emitConnectionEvent(event));
@@ -2845,7 +2875,21 @@ var SSEConnectionManager = class {
     try {
       const client = new MCPClient({
         identity: this.identity,
-        sessionId
+        sessionId,
+        // These fields are optional in MCPClient, but when rehydrating a known
+        // stored session on the server we pass them explicitly to preserve the
+        // original connection metadata instead of relying on lazy
+        // reloading during initialize().
+        serverId: session.serverId,
+        serverName: session.serverName,
+        serverUrl: session.serverUrl,
+        callbackUrl: session.callbackUrl,
+        // NOTE: transportType is intentionally omitted here.
+        // The session's stored transportType is a placeholder ('streamable_http')
+        // set before transport negotiation. Omitting it lets MCPClient auto-negotiate
+        // (try streamable_http → SSE fallback), which is critical for servers like
+        // Neon that only support SSE transport.
+        headers: session.headers
       });
       client.onConnectionEvent((event) => this.emitConnectionEvent(event));
       await client.finishAuth(code);
@@ -3937,6 +3981,7 @@ var ToolIndex = class _ToolIndex {
         name: tool.name,
         description: tool.description ?? "",
         serverName: tool.serverName,
+        serverId: tool.serverId,
         sessionId: tool.sessionId,
         estimatedTokens
       });
@@ -3999,12 +4044,50 @@ var ToolIndex = class _ToolIndex {
    */
   async search(query, topK = 5) {
     if (this.tools.size === 0) return [];
-    const queryLower = query.toLowerCase();
-    const queryTokens = this.tokenize(queryLower);
+    const queryLower = query.toLowerCase().trim();
+    const exactMatches = [...this.toolSummaries.values()].filter(
+      (summary) => summary.name.toLowerCase() === queryLower
+    );
+    if (exactMatches.length > 0) {
+      return exactMatches.slice(0, topK);
+    }
+    if (queryLower.startsWith("mcp__") && queryLower.length > 5) {
+      const prefixMatches = [...this.toolSummaries.values()].filter((t) => t.name.toLowerCase().startsWith(queryLower)).slice(0, topK);
+      if (prefixMatches.length > 0) return prefixMatches;
+    }
+    const queryTermsRaw = queryLower.split(/\s+/).filter((t) => t.length > 0);
+    const requiredTerms = [];
+    const optionalTerms = [];
+    for (const term of queryTermsRaw) {
+      if (term.startsWith("+") && term.length > 1) {
+        requiredTerms.push(term.slice(1));
+      } else {
+        optionalTerms.push(term);
+      }
+    }
+    const allScoringTerms = requiredTerms.length > 0 ? [...requiredTerms, ...optionalTerms] : queryTermsRaw;
+    const normalizedQueryText = allScoringTerms.join(" ").trim();
+    const queryTokens = this.tokenize(allScoringTerms.join(" "));
+    const candidateKeys = /* @__PURE__ */ new Set();
+    for (const docKey of this.toolSummaries.keys()) {
+      if (requiredTerms.length > 0) {
+        const text = this.searchTexts.get(docKey) || "";
+        const summary = this.toolSummaries.get(docKey);
+        const nameLower = summary.name.toLowerCase();
+        const matchesAll = requiredTerms.every(
+          (term) => text.includes(term) || nameLower.includes(term)
+        );
+        if (!matchesAll) continue;
+      }
+      candidateKeys.add(docKey);
+    }
     const keywordScores = /* @__PURE__ */ new Map();
     const k1 = 1.2;
     const b = 0.75;
-    for (const [docKey, docTf] of this.tfVectors) {
+    for (const docKey of candidateKeys) {
+      const docTf = this.tfVectors.get(docKey);
+      if (!docTf) continue;
+      const summary = this.toolSummaries.get(docKey);
       let score = 0;
       const docLen = this.docLengths.get(docKey) ?? 0;
       for (const tok of queryTokens) {
@@ -4015,16 +4098,31 @@ var ToolIndex = class _ToolIndex {
         const denominator = tfVal + k1 * (1 - b + b * (docLen / this.avgDocLength));
         score += idf * (numerator / denominator);
       }
-      keywordScores.set(docKey, score);
+      const serverLower = (summary.serverName || summary.serverId || "").toLowerCase();
+      const toolLower = summary.name.toLowerCase();
+      for (const term of allScoringTerms) {
+        if (serverLower.includes(term)) {
+          score += 10;
+        }
+        if (toolLower.includes(term)) {
+          score += 5;
+        }
+      }
+      if (score > 0) {
+        keywordScores.set(docKey, score);
+      }
     }
     let embeddingScores = null;
     if (this.options.embedFn && this.embeddings.size > 0) {
       try {
-        const [queryEmbedding] = await this.options.embedFn([queryLower]);
+        const [queryEmbedding] = await this.options.embedFn([normalizedQueryText]);
         if (queryEmbedding) {
           embeddingScores = /* @__PURE__ */ new Map();
-          for (const [docKey, vec] of this.embeddings) {
-            embeddingScores.set(docKey, this.cosineSimilarity(queryEmbedding, vec));
+          for (const docKey of candidateKeys) {
+            const vec = this.embeddings.get(docKey);
+            if (vec) {
+              embeddingScores.set(docKey, this.cosineSimilarity(queryEmbedding, vec));
+            }
           }
         }
       } catch {
@@ -4032,7 +4130,7 @@ var ToolIndex = class _ToolIndex {
     }
     const kw = this.options.keywordWeight;
     const finalScores = [];
-    for (const docKey of this.toolSummaries.keys()) {
+    for (const docKey of candidateKeys) {
       const kwScore = keywordScores.get(docKey) ?? 0;
       const embScore = embeddingScores?.get(docKey) ?? 0;
       const score = embeddingScores ? kw * kwScore + (1 - kw) * embScore : kwScore;
@@ -4090,7 +4188,7 @@ var ToolIndex = class _ToolIndex {
   getTool(name, namespace) {
     const list = this.tools.get(name) ?? [];
     if (!namespace) return list;
-    return list.filter((t) => t.sessionId === namespace || t.serverName === namespace);
+    return list.filter((t) => t.sessionId === namespace || t.serverId === namespace);
   }
   /** All indexed tool names. */
   getToolNames() {
@@ -4150,7 +4248,7 @@ var ToolIndex = class _ToolIndex {
     return parts.join(" ");
   }
   getDocumentKey(tool) {
-    return `${tool.sessionId}::${tool.serverName}::${tool.name}`;
+    return `${tool.sessionId}::${tool.serverId}::${tool.name}`;
   }
   /** Simple whitespace + camelCase + snake_case tokenizer. */
   tokenize(text) {
@@ -4238,13 +4336,13 @@ init_cjs_shims();
 function createSearchToolDefinition() {
   return {
     name: "mcp_search_tool_bm25",
-    description: 'Search the catalog of available tools using BM25 natural language ranking. Returns tool names, descriptions, and server info. Use this FIRST to find relevant tools before calling them. Example queries: "database query", "send email", "github pull request".',
+    description: 'Search the catalog of available tools. Returns tool names, descriptions, and server info. Use this FIRST to find relevant tools before calling them.\n\nQuery forms:\n- "select:Read,Edit,Grep" \u2014 fetch these exact tools by name\n- "notebook jupyter" \u2014 keyword search, up to limit best matches\n- "+slack send" \u2014 require "slack" in the name, rank by remaining terms',
     inputSchema: {
       type: "object",
       properties: {
         query: {
           type: "string",
-          description: "Natural language description of the capability you need."
+          description: 'Query to find tools. Use "select:<tool_name>" for direct selection, or keywords to search. Prefix keywords with + to require them.'
         },
         limit: {
           type: "number",
@@ -4286,9 +4384,9 @@ function createGetSchemaToolDefinition() {
           type: "string",
           description: "The exact tool name returned by mcp_search_tool_bm25."
         },
-        serverName: {
+        serverId: {
           type: "string",
-          description: "Optional: The server name provided in mcp_search_tool_bm25. Required if multiple tools have the same name."
+          description: "Optional: The server ID provided in mcp_search_tool_bm25. Required if multiple tools have the same name."
         }
       },
       required: ["toolName"]
@@ -4306,9 +4404,9 @@ function createExecuteToolDefinition() {
           type: "string",
           description: "The exact tool name from mcp_search_tool_bm25 results."
         },
-        serverName: {
+        serverId: {
           type: "string",
-          description: "Optional: The server name provided in mcp_search_tool_bm25. Required if multiple tools have the same name."
+          description: "Optional: The server ID provided in mcp_search_tool_bm25. Required if multiple tools have the same name."
         },
         args: {
           type: "object",
@@ -4338,9 +4436,43 @@ async function executeMetaTool(toolName, args, router, callToolFn) {
     case "mcp_search_tool_bm25": {
       const query = String(args.query ?? "");
       const limit = Math.min(Number(args.limit) || 5, 20);
+      const selectMatch = query.match(/^select:(.+)$/i);
+      if (selectMatch) {
+        const requested = selectMatch[1].split(",").map((s) => s.trim()).filter(Boolean);
+        const found = [];
+        const errors = [];
+        for (const requestedToolName of requested) {
+          const { tool, error } = resolveToolSchema(requestedToolName);
+          if (error) {
+            const errorMsg = error.content[0]?.type === "text" ? error.content[0].text : "Unknown error";
+            errors.push(`- **${requestedToolName}**: ${errorMsg}`);
+          } else if (tool) {
+            found.push(tool);
+          } else {
+            errors.push(`- **${requestedToolName}**: Tool not found. Try searching with mcp_search_tool_bm25.`);
+          }
+        }
+        const lines = [];
+        if (found.length > 0) {
+          lines.push(...found.map(
+            (t, i) => `${i + 1}. **${t.name}** (server: ${t.serverName}, serverId: ${t.serverId})
+   ${t.description}`
+          ));
+        }
+        if (errors.length > 0) {
+          if (lines.length > 0) lines.push("");
+          lines.push("Errors resolving some tools:");
+          lines.push(...errors);
+        }
+        const text2 = lines.length > 0 ? lines.join("\n") : `No tools found matching select query: ${requested.join(", ")}`;
+        return {
+          content: [{ type: "text", text: text2 }],
+          isError: found.length === 0
+        };
+      }
       const results = await router.searchTools(query, limit);
       const text = results.length === 0 ? "No tools found matching your query. Try different keywords." : results.map(
-        (t, i) => `${i + 1}. **${t.name}** (server: ${t.serverName})
+        (t, i) => `${i + 1}. **${t.name}** (server: ${t.serverName}, serverId: ${t.serverId})
    ${t.description}
    Estimated tokens: ${t.estimatedTokens}`
       ).join("\n");
@@ -4354,7 +4486,7 @@ async function executeMetaTool(toolName, args, router, callToolFn) {
       const limit = Math.min(Number(args.limit) || 5, 20);
       const results = await router.searchToolsRegex(pattern, limit);
       const text = results.length === 0 ? "No tools matched your regex pattern. Try a broader pattern." : results.map(
-        (t, i) => `${i + 1}. **${t.name}** (server: ${t.serverName})
+        (t, i) => `${i + 1}. **${t.name}** (server: ${t.serverName}, serverId: ${t.serverId})
    ${t.description}
    Estimated tokens: ${t.estimatedTokens}`
       ).join("\n");
@@ -4365,7 +4497,7 @@ async function executeMetaTool(toolName, args, router, callToolFn) {
     }
     case "mcp_get_tool_schema": {
       const name = String(args.toolName ?? "");
-      const namespace = String(args.serverName ?? "") || void 0;
+      const namespace = String(args.serverId ?? "") || void 0;
       const { tool, error } = resolveToolSchema(name, namespace);
       if (error) {
         return error;
@@ -4393,7 +4525,7 @@ async function executeMetaTool(toolName, args, router, callToolFn) {
     }
     case "mcp_execute_tool": {
       const targetToolName = String(args.toolName ?? "");
-      const namespace = String(args.serverName ?? "") || void 0;
+      const namespace = String(args.serverId ?? "") || void 0;
       const toolArgs = args.args ?? {};
       if (!targetToolName) {
         return {
@@ -4542,9 +4674,9 @@ var ToolRouter = class {
     const matches = this.index.getTool(toolName, namespace);
     if (matches.length === 0) return void 0;
     if (matches.length > 1) {
-      const servers = matches.map((m) => m.serverName).join(", ");
+      const servers = matches.map((m) => m.serverId).join(", ");
       throw new Error(
-        `Tool "${toolName}" is provided by multiple servers: [${servers}]. Please specify the desired "serverName" as a namespace.`
+        `Tool "${toolName}" is provided by multiple servers: [${servers}]. Please specify the desired "serverId" as a namespace.`
       );
     }
     return matches[0];
@@ -4655,6 +4787,7 @@ var ToolRouter = class {
         for (const tool of tools) {
           result.push({
             ...tool,
+            serverId,
             serverName,
             sessionId
           });
@@ -4688,16 +4821,16 @@ var ToolRouter = class {
     } else {
       const serverTools = /* @__PURE__ */ new Map();
       for (const tool of this.allTools) {
-        const group = tool.serverName;
+        const group = tool.serverId;
         if (!serverTools.has(group)) {
           serverTools.set(group, []);
         }
         serverTools.get(group).push(tool.name);
       }
-      for (const [serverName, tools] of serverTools) {
-        this.groupsMap.set(serverName, {
+      for (const [serverId, tools] of serverTools) {
+        this.groupsMap.set(serverId, {
           tools,
-          active: this.activeGroups.size === 0 || this.activeGroups.has(serverName)
+          active: this.activeGroups.size === 0 || this.activeGroups.has(serverId)
         });
       }
     }