@mcpjam/inspector 1.0.17 → 1.0.19

package/dist/server/index.js

@@ -172,43 +172,52 @@ var MCPClientManager = class {
   getServerSummaries() {
     return Array.from(this.clientStates.entries()).map(([serverId, state]) => ({
       id: serverId,
-      status: this.resolveConnectionStatus(state),
+      status: this.getConnectionStatusByAttemptingPing(serverId),
       config: state.config
     }));
   }
-  getConnectionStatus(serverId) {
-    return this.resolveConnectionStatus(this.clientStates.get(serverId));
+  getConnectionStatusByAttemptingPing(serverId) {
+    const state = this.clientStates.get(serverId);
+    if (state == null ? void 0 : state.promise) {
+      return "connecting";
+    }
+    const client = state == null ? void 0 : state.client;
+    if (!client) {
+      return "disconnected";
+    }
+    try {
+      client.ping();
+      return "connected";
+    } catch (error) {
+      return "disconnected";
+    }
   }
   getServerConfig(serverId) {
     var _a2;
     return (_a2 = this.clientStates.get(serverId)) == null ? void 0 : _a2.config;
   }
   async connectToServer(serverId, config) {
-    var _a2;
-    if (this.clientStates.has(serverId)) {
+    const timeout = this.getTimeout(config);
+    const existingState = this.clientStates.get(serverId);
+    if (existingState == null ? void 0 : existingState.client) {
       throw new Error(`MCP server "${serverId}" is already connected.`);
     }
-    const timeout = this.getTimeout(config);
-    const state = (_a2 = this.clientStates.get(serverId)) != null ? _a2 : {
+    const state = existingState != null ? existingState : {
       config,
       timeout
     };
     state.config = config;
     state.timeout = timeout;
-    if (state.client) {
-      this.clientStates.set(serverId, state);
-      return state.client;
-    }
     if (state.promise) {
       this.clientStates.set(serverId, state);
       return state.promise;
     }
     const connectionPromise = (async () => {
-      var _a22;
+      var _a2;
       const client = new Client(
         {
           name: this.defaultClientName ? `${this.defaultClientName}` : serverId,
-          version: (_a22 = config.version) != null ? _a22 : this.defaultClientVersion
+          version: (_a2 = config.version) != null ? _a2 : this.defaultClientVersion
         },
         {
           capabilities: this.buildCapabilities(config)
@@ -218,8 +227,8 @@ var MCPClientManager = class {
       this.applyElicitationHandler(serverId, client);
       if (config.onError) {
         client.onerror = (error) => {
-          var _a3;
-          (_a3 = config.onError) == null ? void 0 : _a3.call(config, error);
+          var _a22;
+          (_a22 = config.onError) == null ? void 0 : _a22.call(config, error);
         };
       }
       client.onclose = () => {
@@ -247,10 +256,7 @@ var MCPClientManager = class {
       this.clientStates.set(serverId, state);
       return client;
     })().catch((error) => {
-      state.promise = void 0;
-      state.client = void 0;
-      state.transport = void 0;
-      this.clientStates.set(serverId, state);
+      this.resetState(serverId);
       throw error;
     });
     state.promise = connectionPromise;
@@ -258,6 +264,10 @@ var MCPClientManager = class {
     return connectionPromise;
   }
   async disconnectServer(serverId) {
+    const connectionStatus = this.getConnectionStatusByAttemptingPing(serverId);
+    if (connectionStatus !== "connected") {
+      return;
+    }
     const client = this.getClientById(serverId);
     try {
       await client.close();
@@ -1004,7 +1014,7 @@ servers.get("/status/:serverId", async (c) => {
   try {
     const serverId = c.req.param("serverId");
     const mcpClientManager2 = c.mcpClientManager;
-    const status = mcpClientManager2.getConnectionStatus(serverId);
+    const status = mcpClientManager2.getConnectionStatusByAttemptingPing(serverId);
     return c.json({
       success: true,
       serverId,
@@ -1075,15 +1085,9 @@ servers.post("/reconnect", async (c) => {
         normalizedConfig.url = new URL(urlValue.href);
       }
     }
-    try {
-      const client = mcpClientManager2.getClient(serverId);
-      if (client) {
-        await mcpClientManager2.disconnectServer(serverId);
-      }
-    } catch {
-    }
+    await mcpClientManager2.disconnectServer(serverId);
     await mcpClientManager2.connectToServer(serverId, normalizedConfig);
-    const status = mcpClientManager2.getConnectionStatus(serverId);
+    const status = mcpClientManager2.getConnectionStatusByAttemptingPing(serverId);
     const message = status === "connected" ? `Reconnected to server: ${serverId}` : `Server ${serverId} reconnected with status '${status}'`;
     const success = status === "connected";
     return c.json({
@@ -2442,10 +2446,6 @@ var handleAgentStepFinish = (streamingContext, text, toolCalls, toolResults, emi
           streamingContext.lastEmittedToolCallId = currentToolCallId;
           const toolName = call.name || call.toolName;
           streamingContext.toolCallIdToName.set(currentToolCallId, toolName);
-          if (!streamingContext.toolNameToCallIds.has(toolName)) {
-            streamingContext.toolNameToCallIds.set(toolName, []);
-          }
-          streamingContext.toolNameToCallIds.get(toolName).push(currentToolCallId);
           if (streamingContext.controller && streamingContext.encoder) {
             sendSseEvent(
               streamingContext.controller,
@@ -2587,10 +2587,6 @@ var createStreamingResponse = async (model, aiSdkTools, messages, streamingConte
               const name = chunk.chunk.toolName || chunk.chunk.name;
               const parameters = chunk.chunk.input ?? chunk.chunk.parameters ?? chunk.chunk.args ?? {};
               streamingContext.toolCallIdToName.set(currentToolCallId, name);
-              if (!streamingContext.toolNameToCallIds.has(name)) {
-                streamingContext.toolNameToCallIds.set(name, []);
-              }
-              streamingContext.toolNameToCallIds.get(name).push(currentToolCallId);
               iterationToolCalls.push({ name, params: parameters });
               sendSseEvent(
                 streamingContext.controller,
@@ -2610,36 +2606,9 @@ var createStreamingResponse = async (model, aiSdkTools, messages, streamingConte
             }
             case "tool-result": {
               const result = chunk.chunk.output ?? chunk.chunk.result ?? chunk.chunk.value;
-              const toolName = chunk.chunk.toolName || chunk.chunk.name || null;
-              let currentToolCallId = chunk.chunk.toolCallId || void 0;
-              if (!currentToolCallId && toolName) {
-                const queue = streamingContext.toolNameToCallIds.get(toolName);
-                if (queue && queue.length > 0) {
-                  currentToolCallId = queue.shift();
-                }
-              }
-              if (!currentToolCallId && streamingContext.lastEmittedToolCallId) {
-                currentToolCallId = streamingContext.lastEmittedToolCallId;
-              }
-              if (!currentToolCallId) {
-                currentToolCallId = `tc_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
-              }
-              if (toolName && streamingContext.toolNameToCallIds.has(toolName)) {
-                const queue = streamingContext.toolNameToCallIds.get(toolName);
-                const index = queue.indexOf(currentToolCallId);
-                if (index !== -1) {
-                  queue.splice(index, 1);
-                }
-              }
-              streamingContext.lastEmittedToolCallId = currentToolCallId;
-              if (toolName) {
-                streamingContext.toolCallIdToName.set(
-                  currentToolCallId,
-                  toolName
-                );
-              }
-              const toolNameForLookup = toolName || streamingContext.toolCallIdToName.get(currentToolCallId);
-              const serverId = toolNameForLookup ? extractServerId(toolNameForLookup) : void 0;
+              const currentToolCallId = streamingContext.lastEmittedToolCallId ?? `tc_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+              const toolName = streamingContext.toolCallIdToName.get(currentToolCallId);
+              const serverId = toolName ? extractServerId(toolName) : void 0;
               iterationToolResults.push({ result });
               sendSseEvent(
                 streamingContext.controller,
@@ -2711,21 +2680,10 @@ var createStreamingResponse = async (model, aiSdkTools, messages, streamingConte
       messageHistory.push(...responseMessages);
       for (const m of responseMessages) {
         if (m.role === "tool") {
+          const currentToolCallId = streamingContext.lastEmittedToolCallId != null ? streamingContext.lastEmittedToolCallId : `tc_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
           const value = m.content;
-          const toolName = m.toolName || m.name;
-          let currentToolCallId;
-          if (toolName && streamingContext.toolNameToCallIds.has(toolName)) {
-            const queue = streamingContext.toolNameToCallIds.get(toolName);
-            if (queue.length > 0) {
-              currentToolCallId = queue.shift();
-            } else {
-              currentToolCallId = streamingContext.lastEmittedToolCallId ?? `tc_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
-            }
-          } else {
-            currentToolCallId = streamingContext.lastEmittedToolCallId ?? `tc_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
-          }
-          const toolNameForLookup = toolName || streamingContext.toolCallIdToName.get(currentToolCallId);
-          const serverId = toolNameForLookup ? extractServerId(toolNameForLookup) : void 0;
+          const toolName = streamingContext.toolCallIdToName.get(currentToolCallId);
+          const serverId = toolName ? extractServerId(toolName) : void 0;
           iterationToolResults.push({ result: value });
           sendSseEvent(streamingContext.controller, streamingContext.encoder, {
             type: "tool_result",
@@ -2815,10 +2773,6 @@ var sendMessagesToBackend = async (messages, streamingContext, mcpClientManager2
     const currentToolCallId = `tc_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
     streamingContext.lastEmittedToolCallId = currentToolCallId;
     streamingContext.toolCallIdToName.set(currentToolCallId, call.name);
-    if (!streamingContext.toolNameToCallIds.has(call.name)) {
-      streamingContext.toolNameToCallIds.set(call.name, []);
-    }
-    streamingContext.toolNameToCallIds.get(call.name).push(currentToolCallId);
     sendSseEvent(streamingContext.controller, streamingContext.encoder, {
       type: "tool_call",
       toolCall: {
@@ -2831,18 +2785,7 @@ var sendMessagesToBackend = async (messages, streamingContext, mcpClientManager2
     });
   };
   const emitToolResult = (result) => {
-    const toolName = result.toolName;
-    let currentToolCallId;
-    if (toolName && streamingContext.toolNameToCallIds.has(toolName)) {
-      const queue = streamingContext.toolNameToCallIds.get(toolName);
-      if (queue.length > 0) {
-        currentToolCallId = queue.shift();
-      } else {
-        currentToolCallId = streamingContext.lastEmittedToolCallId ?? `tc_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
-      }
-    } else {
-      currentToolCallId = streamingContext.lastEmittedToolCallId ?? `tc_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
-    }
+    const currentToolCallId = streamingContext.lastEmittedToolCallId != null ? streamingContext.lastEmittedToolCallId : `tc_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
     sendSseEvent(streamingContext.controller, streamingContext.encoder, {
       type: "tool_result",
       toolResult: {
@@ -2995,8 +2938,7 @@ chat.post("/", async (c) => {
           toolCallId: 0,
           lastEmittedToolCallId: null,
           stepIndex: 0,
-          toolCallIdToName: /* @__PURE__ */ new Map(),
-          toolNameToCallIds: /* @__PURE__ */ new Map()
+          toolCallIdToName: /* @__PURE__ */ new Map()
         };
         mcpClientManager2.setElicitationCallback(async (request) => {
           const elicitationRequest = {
@@ -3218,7 +3160,7 @@ import { MCPClient } from "@mastra/mcp";
 import { streamText as streamText2 } from "ai";
 
 // ../node_modules/convex/dist/esm/index.js
-var version = "1.27.3";
+var version = "1.28.0";
 
 // ../node_modules/convex/dist/esm/values/base64.js
 var lookup = [];
@@ -3849,7 +3791,7 @@ function createApi(pathParts = []) {
 }
 var anyApi = createApi();
 
-// ../node_modules/convex/dist/esm/browser/long.js
+// ../node_modules/convex/dist/esm/vendor/long.js
 var __defProp4 = Object.defineProperty;
 var __defNormalProp3 = (obj, key, value) => key in obj ? __defProp4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField3 = (obj, key, value) => __defNormalProp3(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -3926,7 +3868,7 @@ var TWO_PWR_32_DBL = TWO_PWR_16_DBL * TWO_PWR_16_DBL;
 var TWO_PWR_64_DBL = TWO_PWR_32_DBL * TWO_PWR_32_DBL;
 var MAX_UNSIGNED_VALUE = new Long(4294967295 | 0, 4294967295 | 0);
 
-// ../node_modules/jwt-decode/build/esm/index.js
+// ../node_modules/convex/dist/esm/vendor/jwt-decode/index.js
 var InvalidTokenError = class extends Error {
 };
 InvalidTokenError.prototype.name = "InvalidTokenError";
@@ -9530,7 +9472,7 @@ function transformServerConfigsToEnvironment(serverIds, clientManager) {
     if (!config) {
       throw new Error(`Server '${serverId}' not found`);
     }
-    const status = clientManager.getConnectionStatus(serverId);
+    const status = clientManager.getConnectionStatusByAttemptingPing(serverId);
     if (status !== "connected") {
       throw new Error(
         `Server '${serverId}' is not connected (status: ${status})`
@@ -9727,7 +9669,7 @@ function resolveServerIdsOrThrow(requestedIds, clientManager) {
 async function collectToolsForServers(clientManager, serverIds) {
   const perServerTools = await Promise.all(
     serverIds.map(async (serverId) => {
-      if (clientManager.getConnectionStatus(serverId) !== "connected") {
+      if (clientManager.getConnectionStatusByAttemptingPing(serverId) !== "connected") {
         return [];
       }
       try {