npm - @mcpjam/inspector - Versions diffs - 1.0.2 → 1.0.3 - Mend

@mcpjam/inspector 1.0.2 → 1.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/README.md +28 -8
package/dist/client/apps_sdk_pizza.png +0 -0
package/dist/client/assets/{index-DfX8IFHm.js → index-BtfU0Trt.js} +131 -131
package/dist/client/index.html +1 -1
package/dist/server/index.js +41 -11
package/dist/server/index.js.map +1 -1
package/package.json +1 -1

package/dist/client/index.html CHANGED Viewed

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/mcp_jam.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>MCPJam Inspector</title>
-    <script type="module" crossorigin src="/assets/index-DfX8IFHm.js"></script>
+    <script type="module" crossorigin src="/assets/index-BtfU0Trt.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-D5Niv-PI.css">
   </head>
   <body>

package/dist/server/index.js CHANGED Viewed

@@ -543,9 +543,10 @@ resources.get("/widget-content", async (c) => {
         400
       );
     }
-    const { serverId, uri, toolInput, toolOutput, toolId } = JSON.parse(
-      Buffer.from(widgetData, "base64").toString()
-    );
+    const base64Decoded = Buffer.from(widgetData, "base64").toString("binary");
+    const percentEncoded = base64Decoded.split("").map((c2) => "%" + ("00" + c2.charCodeAt(0).toString(16)).slice(-2)).join("");
+    const jsonString = decodeURIComponent(percentEncoded);
+    const { serverId, uri, toolInput, toolOutput, toolId } = JSON.parse(jsonString);
     const mcpClientManager = c.mcpJamClientManager;
     const connectedServers = mcpClientManager.getConnectedServers();
     let actualServerId = serverId;
@@ -1317,6 +1318,8 @@ var handleAgentStepFinish = (streamingContext, text, toolCalls, toolResults, emi
         for (const call of toolCalls) {
           const currentToolCallId = ++streamingContext.toolCallId;
           streamingContext.lastEmittedToolCallId = currentToolCallId;
+          const toolName = call.name || call.toolName;
+          streamingContext.toolCallIdToName.set(currentToolCallId, toolName);
           if (streamingContext.controller && streamingContext.encoder) {
             sendSseEvent(
               streamingContext.controller,
@@ -1325,7 +1328,7 @@ var handleAgentStepFinish = (streamingContext, text, toolCalls, toolResults, emi
                 type: "tool_call",
                 toolCall: {
                   id: currentToolCallId,
-                  name: call.name || call.toolName,
+                  name: toolName,
                   parameters: call.params || call.args || {},
                   timestamp: (/* @__PURE__ */ new Date()).toISOString(),
                   status: "executing"
@@ -1378,7 +1381,11 @@ var handleAgentStepFinish = (streamingContext, text, toolCalls, toolResults, emi
   } catch {
   }
 };
-var createStreamingResponse = async (model, aiSdkTools, messages, streamingContext, provider, temperature, systemPrompt) => {
+var createStreamingResponse = async (model, aiSdkTools, messages, streamingContext, provider, toolsWithServerId, temperature, systemPrompt) => {
+  const extractServerId = (toolName) => {
+    const tool2 = toolsWithServerId[toolName];
+    return tool2?._serverId;
+  };
   const messageHistory = (messages || []).map((m) => {
     switch (m.role) {
       case "system":
@@ -1428,6 +1435,7 @@ var createStreamingResponse = async (model, aiSdkTools, messages, streamingConte
             streamingContext.lastEmittedToolCallId = currentToolCallId;
             const name = chunk.chunk.toolName || chunk.chunk.name;
             const parameters = chunk.chunk.input ?? chunk.chunk.parameters ?? chunk.chunk.args ?? {};
+            streamingContext.toolCallIdToName.set(currentToolCallId, name);
             iterationToolCalls.push({ name, params: parameters });
             sendSseEvent(
               streamingContext.controller,
@@ -1447,7 +1455,9 @@ var createStreamingResponse = async (model, aiSdkTools, messages, streamingConte
           }
           case "tool-result": {
             const result = chunk.chunk.output ?? chunk.chunk.result ?? chunk.chunk.value;
-            const currentToolCallId = streamingContext.lastEmittedToolCallId != null ? streamingContext.lastEmittedToolCallId : streamingContext.toolCallId;
+            const currentToolCallId = streamingContext.lastEmittedToolCallId ?? ++streamingContext.toolCallId;
+            const toolName = streamingContext.toolCallIdToName.get(currentToolCallId);
+            const serverId = toolName ? extractServerId(toolName) : void 0;
             iterationToolResults.push({ result });
             sendSseEvent(
               streamingContext.controller,
@@ -1458,7 +1468,8 @@ var createStreamingResponse = async (model, aiSdkTools, messages, streamingConte
                   id: currentToolCallId,
                   toolCallId: currentToolCallId,
                   result,
-                  timestamp: (/* @__PURE__ */ new Date()).toISOString()
+                  timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+                  serverId
                 }
               }
             );
@@ -1485,6 +1496,8 @@ var createStreamingResponse = async (model, aiSdkTools, messages, streamingConte
         if (m.role === "tool") {
           const currentToolCallId = streamingContext.lastEmittedToolCallId != null ? streamingContext.lastEmittedToolCallId : ++streamingContext.toolCallId;
           const value = m.content;
+          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",
@@ -1492,7 +1505,8 @@ var createStreamingResponse = async (model, aiSdkTools, messages, streamingConte
               id: currentToolCallId,
               toolCallId: currentToolCallId,
               result: value,
-              timestamp: (/* @__PURE__ */ new Date()).toISOString()
+              timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+              serverId
             }
           });
         }
@@ -1542,6 +1556,7 @@ var sendMessagesToBackend = async (messages, streamingContext, mcpClientManager,
   const emitToolCall = (call) => {
     const currentToolCallId = ++streamingContext.toolCallId;
     streamingContext.lastEmittedToolCallId = currentToolCallId;
+    streamingContext.toolCallIdToName.set(currentToolCallId, call.name);
     sendSseEvent(streamingContext.controller, streamingContext.encoder, {
       type: "tool_call",
       toolCall: {
@@ -1705,7 +1720,8 @@ chat.post("/", async (c) => {
           encoder,
           toolCallId: 0,
           lastEmittedToolCallId: null,
-          stepIndex: 0
+          stepIndex: 0,
+          toolCallIdToName: /* @__PURE__ */ new Map()
         };
         mcpClientManager.setElicitationCallback(async (request) => {
           const elicitationRequest = {
@@ -1753,10 +1769,23 @@ chat.post("/", async (c) => {
               requestData.selectedServers
             );
           } else {
-            const flatTools = await mcpClientManager.getFlattenedToolsetsForEnabledServers(
+            const toolsets = await mcpClientManager.getToolsetsWithServerIds(
               requestData.selectedServers
             );
-            const aiSdkTools = convertMastraToolsToVercelTools(flatTools);
+            const flatToolsWithServerId = {};
+            for (const [serverId, serverTools] of Object.entries(
+              toolsets || {}
+            )) {
+              if (serverTools && typeof serverTools === "object") {
+                for (const [toolName, tool2] of Object.entries(serverTools)) {
+                  flatToolsWithServerId[toolName] = {
+                    ...tool2,
+                    _serverId: serverId
+                  };
+                }
+              }
+            }
+            const aiSdkTools = convertMastraToolsToVercelTools(flatToolsWithServerId);
             const llmModel = createLlmModel(
               model,
               apiKey || "",
@@ -1768,6 +1797,7 @@ chat.post("/", async (c) => {
               messages,
               streamingContext,
               provider,
+              flatToolsWithServerId,
               temperature,
               systemPrompt
             );