@mcpjam/inspector 1.0.16 → 1.0.18

package/dist/server/index.js

@@ -48,7 +48,7 @@ import { readFileSync as readFileSync2, existsSync as existsSync2 } from "fs";
 import { join as join2, dirname, resolve } from "path";
 import { fileURLToPath } from "url";
 
-// ../sdk/dist/chunk-6XEFXCUG.js
+// ../sdk/dist/index.js
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import {
@@ -152,11 +152,12 @@ var MCPClientManager = class {
     this.toolsMetadataCache = /* @__PURE__ */ new Map();
     this.defaultLogJsonRpc = false;
     this.pendingElicitations = /* @__PURE__ */ new Map();
-    var _a2, _b2, _c, _d;
+    var _a2, _b2, _c, _d, _e;
     this.defaultClientVersion = (_a2 = options.defaultClientVersion) != null ? _a2 : "1.0.0";
-    this.defaultCapabilities = { ...(_b2 = options.defaultCapabilities) != null ? _b2 : {} };
-    this.defaultTimeout = (_c = options.defaultTimeout) != null ? _c : DEFAULT_REQUEST_TIMEOUT_MSEC;
-    this.defaultLogJsonRpc = (_d = options.defaultLogJsonRpc) != null ? _d : false;
+    this.defaultClientName = (_b2 = options.defaultClientName) != null ? _b2 : void 0;
+    this.defaultCapabilities = { ...(_c = options.defaultCapabilities) != null ? _c : {} };
+    this.defaultTimeout = (_d = options.defaultTimeout) != null ? _d : DEFAULT_REQUEST_TIMEOUT_MSEC;
+    this.defaultLogJsonRpc = (_e = options.defaultLogJsonRpc) != null ? _e : false;
     this.defaultRpcLogger = options.rpcLogger;
     for (const [id, config] of Object.entries(servers2)) {
       void this.connectToServer(id, config);
@@ -206,7 +207,7 @@ var MCPClientManager = class {
       var _a22;
       const client = new Client(
         {
-          name: serverId,
+          name: this.defaultClientName ? `${this.defaultClientName}` : serverId,
           version: (_a22 = config.version) != null ? _a22 : this.defaultClientVersion
         },
         {
@@ -1461,7 +1462,14 @@ resources.post("/read", async (c) => {
 resources.post("/widget/store", async (c) => {
   try {
     const body = await c.req.json();
-    const { serverId, uri, toolInput, toolOutput, toolResponseMetadata, toolId } = body;
+    const {
+      serverId,
+      uri,
+      toolInput,
+      toolOutput,
+      toolResponseMetadata,
+      toolId
+    } = body;
     if (!serverId || !uri || !toolId) {
       return c.json({ success: false, error: "Missing required fields" }, 400);
     }
@@ -1849,11 +1857,238 @@ var MCPJAM_PROVIDED_MODEL_IDS = [
   "meta-llama/llama-3.3-70b-instruct",
   "openai/gpt-oss-120b",
   "x-ai/grok-4-fast",
-  "openai/gpt-5-nano"
+  "openai/gpt-5-nano",
+  "anthropic/claude-sonnet-4.5",
+  "anthropic/claude-haiku-4.5",
+  "openai/gpt-5-codex",
+  "openai/gpt-5",
+  "openai/gpt-5-mini",
+  "google/gemini-2.5-flash-preview-09-2025",
+  "moonshotai/kimi-k2-0905",
+  "google/gemini-2.5-flash",
+  "z-ai/glm-4.6"
 ];
 var isMCPJamProvidedModel = (modelId) => {
   return MCPJAM_PROVIDED_MODEL_IDS.includes(modelId);
 };
+var Model = /* @__PURE__ */ ((Model2) => {
+  Model2["CLAUDE_OPUS_4_0"] = "claude-opus-4-0";
+  Model2["CLAUDE_SONNET_4_0"] = "claude-sonnet-4-0";
+  Model2["CLAUDE_3_7_SONNET_LATEST"] = "claude-3-7-sonnet-latest";
+  Model2["CLAUDE_3_5_SONNET_LATEST"] = "claude-3-5-sonnet-latest";
+  Model2["CLAUDE_3_5_HAIKU_LATEST"] = "claude-3-5-haiku-latest";
+  Model2["GPT_4_1"] = "gpt-4.1";
+  Model2["GPT_4_1_MINI"] = "gpt-4.1-mini";
+  Model2["GPT_4_1_NANO"] = "gpt-4.1-nano";
+  Model2["GPT_4O"] = "gpt-4o";
+  Model2["GPT_4O_MINI"] = "gpt-4o-mini";
+  Model2["GPT_4_TURBO"] = "gpt-4-turbo";
+  Model2["GPT_4"] = "gpt-4";
+  Model2["GPT_5"] = "gpt-5";
+  Model2["GPT_5_MINI"] = "gpt-5-mini";
+  Model2["GPT_5_NANO"] = "gpt-5-nano";
+  Model2["GPT_5_MAIN"] = "openai/gpt-5";
+  Model2["GPT_5_PRO"] = "gpt-5-pro";
+  Model2["GPT_5_CODEX"] = "gpt-5-codex";
+  Model2["GPT_3_5_TURBO"] = "gpt-3.5-turbo";
+  Model2["DEEPSEEK_CHAT"] = "deepseek-chat";
+  Model2["DEEPSEEK_REASONER"] = "deepseek-reasoner";
+  Model2["GEMINI_2_5_PRO"] = "gemini-2.5-pro";
+  Model2["GEMINI_2_5_FLASH"] = "gemini-2.5-flash";
+  Model2["GEMINI_2_5_FLASH_LITE"] = "gemini-2.5-flash-lite";
+  Model2["GEMINI_2_0_FLASH_EXP"] = "gemini-2.0-flash-exp";
+  Model2["GEMINI_1_5_PRO"] = "gemini-1.5-pro";
+  Model2["GEMINI_1_5_PRO_002"] = "gemini-1.5-pro-002";
+  Model2["GEMINI_1_5_FLASH"] = "gemini-1.5-flash";
+  Model2["GEMINI_1_5_FLASH_002"] = "gemini-1.5-flash-002";
+  Model2["GEMINI_1_5_FLASH_8B"] = "gemini-1.5-flash-8b";
+  Model2["GEMINI_1_5_FLASH_8B_001"] = "gemini-1.5-flash-8b-001";
+  Model2["GEMMA_3_2B"] = "gemma-3-2b";
+  Model2["GEMMA_3_9B"] = "gemma-3-9b";
+  Model2["GEMMA_3_27B"] = "gemma-3-27b";
+  Model2["GEMMA_2_2B"] = "gemma-2-2b";
+  Model2["GEMMA_2_9B"] = "gemma-2-9b";
+  Model2["GEMMA_2_27B"] = "gemma-2-27b";
+  Model2["CODE_GEMMA_2B"] = "codegemma-2b";
+  Model2["CODE_GEMMA_7B"] = "codegemma-7b";
+  Model2["MISTRAL_LARGE_LATEST"] = "mistral-large-latest";
+  Model2["MISTRAL_SMALL_LATEST"] = "mistral-small-latest";
+  Model2["CODESTRAL_LATEST"] = "codestral-latest";
+  Model2["MINISTRAL_8B_LATEST"] = "ministral-8b-latest";
+  Model2["MINISTRAL_3B_LATEST"] = "ministral-3b-latest";
+  return Model2;
+})(Model || {});
+var SUPPORTED_MODELS = [
+  {
+    id: "claude-opus-4-0" /* CLAUDE_OPUS_4_0 */,
+    name: "Claude Opus 4",
+    provider: "anthropic"
+  },
+  {
+    id: "claude-sonnet-4-0" /* CLAUDE_SONNET_4_0 */,
+    name: "Claude Sonnet 4",
+    provider: "anthropic"
+  },
+  {
+    id: "claude-3-7-sonnet-latest" /* CLAUDE_3_7_SONNET_LATEST */,
+    name: "Claude Sonnet 3.7",
+    provider: "anthropic"
+  },
+  {
+    id: "claude-3-5-sonnet-latest" /* CLAUDE_3_5_SONNET_LATEST */,
+    name: "Claude Sonnet 3.5",
+    provider: "anthropic"
+  },
+  {
+    id: "claude-3-5-haiku-latest" /* CLAUDE_3_5_HAIKU_LATEST */,
+    name: "Claude Haiku 3.5",
+    provider: "anthropic"
+  },
+  { id: "gpt-5" /* GPT_5 */, name: "GPT-5", provider: "openai" },
+  { id: "gpt-5-mini" /* GPT_5_MINI */, name: "GPT-5 Mini", provider: "openai" },
+  { id: "gpt-5-nano" /* GPT_5_NANO */, name: "GPT-5 Nano", provider: "openai" },
+  { id: Model.GPT_5_CHAT_LATEST, name: "GPT-5 Chat", provider: "openai" },
+  { id: "gpt-5-pro" /* GPT_5_PRO */, name: "GPT-5 Pro", provider: "openai" },
+  { id: "gpt-5-codex" /* GPT_5_CODEX */, name: "GPT-5 Codex", provider: "openai" },
+  { id: "gpt-4.1" /* GPT_4_1 */, name: "GPT-4.1", provider: "openai" },
+  { id: "gpt-4.1-mini" /* GPT_4_1_MINI */, name: "GPT-4.1 Mini", provider: "openai" },
+  { id: "gpt-4.1-nano" /* GPT_4_1_NANO */, name: "GPT-4.1 Nano", provider: "openai" },
+  { id: "gpt-4o" /* GPT_4O */, name: "GPT-4o", provider: "openai" },
+  { id: "gpt-4o-mini" /* GPT_4O_MINI */, name: "GPT-4o Mini", provider: "openai" },
+  { id: "deepseek-chat" /* DEEPSEEK_CHAT */, name: "DeepSeek Chat", provider: "deepseek" },
+  {
+    id: "deepseek-reasoner" /* DEEPSEEK_REASONER */,
+    name: "DeepSeek Reasoner",
+    provider: "deepseek"
+  },
+  // Google Gemini models (latest first)
+  {
+    id: "gemini-2.5-pro" /* GEMINI_2_5_PRO */,
+    name: "Gemini 2.5 Pro",
+    provider: "google"
+  },
+  {
+    id: "gemini-2.5-flash" /* GEMINI_2_5_FLASH */,
+    name: "Gemini 2.5 Flash",
+    provider: "google"
+  },
+  {
+    id: "gemini-2.0-flash-exp" /* GEMINI_2_0_FLASH_EXP */,
+    name: "Gemini 2.0 Flash Experimental",
+    provider: "google"
+  },
+  {
+    id: "gemini-1.5-pro-002" /* GEMINI_1_5_PRO_002 */,
+    name: "Gemini 1.5 Pro 002",
+    provider: "google"
+  },
+  {
+    id: "gemini-1.5-pro" /* GEMINI_1_5_PRO */,
+    name: "Gemini 1.5 Pro",
+    provider: "google"
+  },
+  {
+    id: "gemini-1.5-flash-002" /* GEMINI_1_5_FLASH_002 */,
+    name: "Gemini 1.5 Flash 002",
+    provider: "google"
+  },
+  {
+    id: "gemini-1.5-flash" /* GEMINI_1_5_FLASH */,
+    name: "Gemini 1.5 Flash",
+    provider: "google"
+  },
+  {
+    id: "meta-llama/llama-3.3-70b-instruct",
+    name: "Llama 3.3 70B (Free)",
+    provider: "meta"
+  },
+  {
+    id: "openai/gpt-oss-120b",
+    name: "GPT-OSS 120B (Free)",
+    provider: "openai"
+  },
+  {
+    id: "x-ai/grok-4-fast",
+    name: "Grok 4 Fast (Free)",
+    provider: "x-ai"
+  },
+  {
+    id: "openai/gpt-5-nano",
+    name: "GPT-5 Nano (Free)",
+    provider: "openai"
+  },
+  {
+    id: "anthropic/claude-sonnet-4.5",
+    name: "Claude Sonnet 4.5 (Free)",
+    provider: "anthropic"
+  },
+  {
+    id: "anthropic/claude-haiku-4.5",
+    name: "Claude Haiku 4.5 (Free)",
+    provider: "anthropic"
+  },
+  {
+    id: "openai/gpt-5-codex",
+    name: "GPT-5 Codex (Free)",
+    provider: "openai"
+  },
+  {
+    id: "openai/gpt-5",
+    name: "GPT-5 (Free)",
+    provider: "openai"
+  },
+  {
+    id: "openai/gpt-5-mini",
+    name: "GPT-5 Mini (Free)",
+    provider: "openai"
+  },
+  {
+    id: "google/gemini-2.5-flash-preview-09-2025",
+    name: "Gemini 2.5 Flash Preview (Free)",
+    provider: "google"
+  },
+  {
+    id: "moonshotai/kimi-k2-0905",
+    name: "Kimi K2 (Free)",
+    provider: "moonshotai"
+  },
+  {
+    id: "google/gemini-2.5-flash",
+    name: "Gemini 2.5 Flash (Free)",
+    provider: "google"
+  },
+  {
+    id: "z-ai/glm-4.6",
+    name: "GLM 4.6 (Free)",
+    provider: "z-ai"
+  },
+  // Mistral models
+  {
+    id: "mistral-large-latest" /* MISTRAL_LARGE_LATEST */,
+    name: "Mistral Large",
+    provider: "mistral"
+  },
+  {
+    id: "mistral-small-latest" /* MISTRAL_SMALL_LATEST */,
+    name: "Mistral Small",
+    provider: "mistral"
+  },
+  {
+    id: "codestral-latest" /* CODESTRAL_LATEST */,
+    name: "Codestral",
+    provider: "mistral"
+  },
+  {
+    id: "ministral-8b-latest" /* MINISTRAL_8B_LATEST */,
+    name: "Ministral 8B",
+    provider: "mistral"
+  },
+  {
+    id: "ministral-3b-latest" /* MINISTRAL_3B_LATEST */,
+    name: "Ministral 3B",
+    provider: "mistral"
+  }
+];
 
 // routes/mcp/chat.ts
 import { TextEncoder as TextEncoder2 } from "util";
@@ -1870,6 +2105,9 @@ function getDefaultTemperatureByProvider(provider) {
     case "google":
       return 0.9;
     // Google's recommended default
+    case "mistral":
+      return 0.7;
+    // Mistral's recommended default
     default:
       return 0;
   }
@@ -1879,6 +2117,7 @@ function getDefaultTemperatureByProvider(provider) {
 import { createAnthropic } from "@ai-sdk/anthropic";
 import { createDeepSeek } from "@ai-sdk/deepseek";
 import { createGoogleGenerativeAI } from "@ai-sdk/google";
+import { createMistral } from "@ai-sdk/mistral";
 import { createOpenAI } from "@ai-sdk/openai";
 import { createOllama } from "ollama-ai-provider-v2";
 var createLlmModel = (modelDefinition, apiKey, ollamaBaseUrl, litellmBaseUrl) => {
@@ -1901,6 +2140,8 @@ var createLlmModel = (modelDefinition, apiKey, ollamaBaseUrl, litellmBaseUrl) =>
       const normalized = /\/api\/?$/.test(raw) ? raw : `${raw.replace(/\/+$/, "")}/api`;
       return createOllama({ baseURL: normalized })(modelDefinition.id);
     }
+    case "mistral":
+      return createMistral({ apiKey })(modelDefinition.id);
     case "litellm": {
       const baseURL = litellmBaseUrl || "http://localhost:4000";
       const openai = createOpenAI({
@@ -2201,6 +2442,10 @@ 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,
@@ -2279,88 +2524,181 @@ var createStreamingResponse = async (model, aiSdkTools, messages, streamingConte
     }
   });
   let steps = 0;
+  let hadError = false;
   while (steps < MAX_AGENT_STEPS) {
     let accumulatedText = "";
     const iterationToolCalls = [];
     const iterationToolResults = [];
-    const streamResult = await streamText({
+    let streamResult;
+    let hadStreamError = false;
+    let streamErrorMessage = "";
+    let response = null;
+    const extractErrorMessage = (error) => {
+      if (error.error && typeof error.error === "object") {
+        const apiError = error.error;
+        if (apiError.data?.error?.message) return apiError.data.error.message;
+        if (apiError.responseBody) {
+          try {
+            const parsed = JSON.parse(apiError.responseBody);
+            if (parsed.error?.message) return parsed.error.message;
+          } catch {
+          }
+        }
+        if (apiError.message) return apiError.message;
+      }
+      if (error.error instanceof Error) return error.error.message;
+      return String(error.error || error.message || "Unknown error occurred");
+    };
+    streamResult = streamText({
       model,
       system: systemPrompt || "You are a helpful assistant with access to MCP tools.",
       temperature: temperature ?? getDefaultTemperatureByProvider(provider),
       tools: aiSdkTools,
       messages: messageHistory,
+      onError: (error) => {
+        hadStreamError = true;
+        streamErrorMessage = extractErrorMessage(error);
+      },
       onChunk: async (chunk) => {
-        switch (chunk.chunk.type) {
-          case "text-delta":
-          case "reasoning-delta": {
-            const text = chunk.chunk.text;
-            if (text) {
-              accumulatedText += text;
+        try {
+          switch (chunk.chunk.type) {
+            case "text-delta":
+            case "reasoning-delta": {
+              const text = chunk.chunk.text;
+              if (text) {
+                accumulatedText += text;
+                sendSseEvent(
+                  streamingContext.controller,
+                  streamingContext.encoder,
+                  {
+                    type: "text",
+                    content: text
+                  }
+                );
+              }
+              break;
+            }
+            case "tool-input-start": {
+              break;
+            }
+            case "tool-call": {
+              const currentToolCallId = `tc_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+              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);
+              if (!streamingContext.toolNameToCallIds.has(name)) {
+                streamingContext.toolNameToCallIds.set(name, []);
+              }
+              streamingContext.toolNameToCallIds.get(name).push(currentToolCallId);
+              iterationToolCalls.push({ name, params: parameters });
               sendSseEvent(
                 streamingContext.controller,
                 streamingContext.encoder,
                 {
-                  type: "text",
-                  content: text
+                  type: "tool_call",
+                  toolCall: {
+                    id: currentToolCallId,
+                    name,
+                    parameters,
+                    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+                    status: "executing"
+                  }
                 }
               );
+              break;
             }
-            break;
-          }
-          case "tool-input-start": {
-            break;
-          }
-          case "tool-call": {
-            const currentToolCallId = `tc_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
-            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,
-              streamingContext.encoder,
-              {
-                type: "tool_call",
-                toolCall: {
-                  id: currentToolCallId,
-                  name,
-                  parameters,
-                  timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-                  status: "executing"
+            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();
                 }
               }
-            );
-            break;
-          }
-          case "tool-result": {
-            const result = chunk.chunk.output ?? chunk.chunk.result ?? chunk.chunk.value;
-            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,
-              streamingContext.encoder,
-              {
-                type: "tool_result",
-                toolResult: {
-                  id: currentToolCallId,
-                  toolCallId: currentToolCallId,
-                  result,
-                  timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-                  serverId
+              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);
                 }
               }
-            );
-            break;
+              streamingContext.lastEmittedToolCallId = currentToolCallId;
+              if (toolName) {
+                streamingContext.toolCallIdToName.set(
+                  currentToolCallId,
+                  toolName
+                );
+              }
+              const toolNameForLookup = toolName || streamingContext.toolCallIdToName.get(currentToolCallId);
+              const serverId = toolNameForLookup ? extractServerId(toolNameForLookup) : void 0;
+              iterationToolResults.push({ result });
+              sendSseEvent(
+                streamingContext.controller,
+                streamingContext.encoder,
+                {
+                  type: "tool_result",
+                  toolResult: {
+                    id: currentToolCallId,
+                    toolCallId: currentToolCallId,
+                    result,
+                    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+                    serverId
+                  }
+                }
+              );
+              break;
+            }
+            default:
+              break;
           }
-          default:
-            break;
+        } catch (chunkError) {
+          hadStreamError = true;
+          streamErrorMessage = chunkError instanceof Error ? chunkError.message : "Error processing chunk";
         }
       }
     });
-    await streamResult.consumeStream();
+    try {
+      await streamResult.consumeStream();
+      if (hadStreamError) {
+        throw new Error(streamErrorMessage);
+      }
+      response = await streamResult.response;
+      if (response.error) {
+        throw response.error;
+      }
+      if (response.experimental_providerMetadata?.openai?.error) {
+        throw new Error(
+          response.experimental_providerMetadata.openai.error.message || "OpenAI API error"
+        );
+      }
+    } catch (error) {
+      const errorMessage = streamErrorMessage || extractErrorMessage(error);
+      sendSseEvent(streamingContext.controller, streamingContext.encoder, {
+        type: "error",
+        error: errorMessage
+      });
+      sendSseEvent(
+        streamingContext.controller,
+        streamingContext.encoder,
+        "[DONE]"
+      );
+      hadError = true;
+      steps++;
+      break;
+    }
+    if (!streamResult || hadError) {
+      steps++;
+      break;
+    }
     handleAgentStepFinish(
       streamingContext,
       accumulatedText,
@@ -2368,16 +2706,26 @@ var createStreamingResponse = async (model, aiSdkTools, messages, streamingConte
       iterationToolResults,
       false
     );
-    const resp = await streamResult.response;
-    const responseMessages = resp?.messages || [];
+    const responseMessages = response?.messages || [];
     if (responseMessages.length) {
       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 = streamingContext.toolCallIdToName.get(currentToolCallId);
-          const serverId = toolName ? extractServerId(toolName) : void 0;
+          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;
           iterationToolResults.push({ result: value });
           sendSseEvent(streamingContext.controller, streamingContext.encoder, {
             type: "tool_result",
@@ -2393,18 +2741,20 @@ var createStreamingResponse = async (model, aiSdkTools, messages, streamingConte
       }
     }
     steps++;
-    const finishReason = await streamResult.finishReason;
+    const finishReason = response?.finishReason || "stop";
     const shouldContinue = finishReason === "tool-calls" || accumulatedText.length === 0 && iterationToolResults.length > 0;
     if (!shouldContinue) break;
   }
-  sendSseEvent(streamingContext.controller, streamingContext.encoder, {
-    type: "elicitation_complete"
-  });
-  sendSseEvent(
-    streamingContext.controller,
-    streamingContext.encoder,
-    "[DONE]"
-  );
+  if (!hadError) {
+    sendSseEvent(streamingContext.controller, streamingContext.encoder, {
+      type: "elicitation_complete"
+    });
+    sendSseEvent(
+      streamingContext.controller,
+      streamingContext.encoder,
+      "[DONE]"
+    );
+  }
 };
 var sendMessagesToBackend = async (messages, streamingContext, mcpClientManager2, baseUrl, modelId, authHeader, selectedServers) => {
   const messageHistory = (messages || []).map((m) => {
@@ -2465,6 +2815,10 @@ 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: {
@@ -2477,7 +2831,18 @@ var sendMessagesToBackend = async (messages, streamingContext, mcpClientManager2
     });
   };
   const emitToolResult = (result) => {
-    const currentToolCallId = streamingContext.lastEmittedToolCallId != null ? streamingContext.lastEmittedToolCallId : `tc_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+    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)}`;
+    }
     sendSseEvent(streamingContext.controller, streamingContext.encoder, {
       type: "tool_result",
       toolResult: {
@@ -2630,7 +2995,8 @@ chat.post("/", async (c) => {
           toolCallId: 0,
           lastEmittedToolCallId: null,
           stepIndex: 0,
-          toolCallIdToName: /* @__PURE__ */ new Map()
+          toolCallIdToName: /* @__PURE__ */ new Map(),
+          toolNameToCallIds: /* @__PURE__ */ new Map()
         };
         mcpClientManager2.setElicitationCallback(async (request) => {
           const elicitationRequest = {