@juspay/neurolink 9.42.1 → 9.43.0

package/dist/cli/commands/mcp.js

@@ -2246,6 +2246,11 @@ ${tools.length > 0 ? tools.map((t) => `- **${t}**: TODO: Add description`).join(
             }
             const serverId = argv.server;
             const foundTool = this.findToolForAnnotation(servers, toolName, serverId);
+            if (foundTool === "ambiguous") {
+                logger.error(chalk.red(`Tool '${toolName}' exists on multiple servers. Use --server <id> to specify which server to annotate.`));
+                logger.always(chalk.yellow("Use 'neurolink mcp annotate --list' to see available tools and their server IDs."));
+                process.exit(1);
+            }
             if (!foundTool) {
                 logger.error(chalk.red(`Tool '${toolName}' not found.${serverId ? ` Server: ${serverId}` : ""}`));
                 logger.always(chalk.yellow("Use 'neurolink mcp annotate --list' to see available tools."));
@@ -2335,22 +2340,29 @@ ${tools.length > 0 ? tools.map((t) => `- **${t}**: TODO: Add description`).join(
         return allTools;
     }
     static findToolForAnnotation(servers, toolName, serverId) {
+        const matches = [];
         for (const server of servers) {
             if (serverId && server.id !== serverId) {
                 continue;
             }
             for (const tool of server.tools || []) {
                 if (tool.name === toolName) {
-                    return {
+                    matches.push({
                         name: tool.name,
                         description: tool.description,
                         serverId: server.id,
                         serverName: server.name,
-                    };
+                    });
                 }
             }
         }
-        return null;
+        if (matches.length === 0) {
+            return null;
+        }
+        if (matches.length > 1) {
+            return "ambiguous";
+        }
+        return matches[0] ?? null;
     }
     static buildAnnotationsFromArgs(argv, foundTool) {
         let annotations = {};

package/dist/cli/commands/proxy.js

@@ -14,6 +14,7 @@ import { homedir } from "node:os";
 import { join, resolve } from "node:path";
 import chalk from "chalk";
 import ora from "ora";
+import { buildProxyHealthResponse, createProxyReadinessState, markProxyReady, waitForProxyReadiness, } from "../../lib/proxy/proxyHealth.js";
 import { logger } from "../../lib/utils/logger.js";
 import { formatUptime, isProcessRunning, StateFileManager, } from "../utils/serverUtils.js";
 import { loadProxyEnvFile, resolveProxyEnvFile, } from "../../lib/proxy/proxyEnv.js";
@@ -390,6 +391,7 @@ async function createProxyStartApp(params) {
     const { createClaudeProxyRoutes } = await import("../../lib/server/routes/claudeProxyRoutes.js");
     const { Hono } = await import("hono");
     const app = new Hono();
+    const readiness = createProxyReadinessState();
     app.onError((err, c) => {
         const errMsg = err instanceof Error ? err.message : String(err);
         logger.always(`[proxy] unhandled error: ${errMsg}`);
@@ -520,23 +522,31 @@ async function createProxyStartApp(params) {
             return c.json(result ?? {});
         });
     }
-    app.get("/health", (c) => c.json({
-        status: "ok",
+    app.get("/health", (c) => c.json(buildProxyHealthResponse(readiness, {
         strategy: params.strategy,
-        uptime: process.uptime(),
+        passthrough: params.passthrough,
         version: PROXY_VERSION,
-    }));
+    })));
     app.get("/status", async (c) => {
         const { getStats } = await import("../../lib/proxy/usageStats.js");
         const stats = getStats();
+        const health = buildProxyHealthResponse(readiness, {
+            strategy: params.strategy,
+            passthrough: params.passthrough,
+            version: PROXY_VERSION,
+        });
         return c.json({
             status: "running",
+            ready: health.ready,
+            acceptingConnections: health.acceptingConnections,
+            readyAt: health.readyAt,
             pid: process.pid,
             port: params.port,
             host: params.host,
             strategy: params.strategy,
             uptime: process.uptime(),
             version: PROXY_VERSION,
+            health,
             stats: {
                 totalAttempts: stats.totalAttempts,
                 totalRequests: stats.totalRequests,
@@ -562,7 +572,7 @@ async function createProxyStartApp(params) {
                 : null,
         });
     });
-    return { app };
+    return { app, readiness };
 }
 async function initializeProxyOpenTelemetry() {
     try {
@@ -724,6 +734,12 @@ async function startProxyRuntime(params) {
         hostname: params.host,
     });
     const guardPid = spawnFailOpenGuard(params.host, params.port, process.pid);
+    const readinessHost = params.host === "0.0.0.0" ? "127.0.0.1" : params.host;
+    await waitForProxyReadiness({
+        host: readinessHost,
+        port: params.port,
+    });
+    markProxyReady(params.readiness);
     const fallbackChain = params.proxyConfig?.routing?.fallbackChain?.map((entry) => ({
         provider: entry.provider,
         model: entry.model,
@@ -734,6 +750,12 @@ async function startProxyRuntime(params) {
         host: params.host,
         strategy: params.strategy,
         startTime: new Date().toISOString(),
+        ready: true,
+        readyAt: params.readiness.readyAtMs
+            ? new Date(params.readiness.readyAtMs).toISOString()
+            : undefined,
+        healthPath: "/health",
+        statusPath: "/status",
         envFile: params.loadedEnvFile,
         fallbackChain,
         guardPid,
@@ -785,7 +807,7 @@ async function startProxyCommandHandler(argv) {
         }
         const port = argv.port ?? 55669;
         const host = argv.host ?? "127.0.0.1";
-        const { app } = await createProxyStartApp({
+        const { app, readiness } = await createProxyStartApp({
             neurolink,
             modelRouter,
             strategy,
@@ -802,6 +824,7 @@ async function startProxyCommandHandler(argv) {
             argv,
             spinner,
             app,
+            readiness,
             host,
             port,
             strategy,

package/dist/core/baseProvider.js

@@ -131,9 +131,15 @@ export class BaseProvider {
                 }
             }
             // CRITICAL: Image generation models don't support real streaming
-            // Force fake streaming for image models to ensure image output is yielded
+            // Force fake streaming for image models to ensure image output is yielded.
+            // Skip this path when the caller explicitly requests non-image output (e.g.
+            // JSON analysis) so dual-mode models like gemini-3.1-flash-image-preview
+            // can still perform text/structured generation.
             const isImageModel = IMAGE_GENERATION_MODELS.some((m) => this.modelName.includes(m));
-            if (isImageModel) {
+            const requestsNonImageOutput = options.output?.format === "json" ||
+                options.output?.format === "structured" ||
+                options.output?.format === "text";
+            if (isImageModel && !requestsNonImageOutput) {
                 logger.info(`Image model detected, forcing fake streaming`, {
                     provider: this.providerName,
                     model: this.modelName,
@@ -537,7 +543,10 @@ export class BaseProvider {
                 return await this.handleVideoGeneration(options, startTime);
             }
             const isImageModel = IMAGE_GENERATION_MODELS.some((m) => this.modelName.includes(m));
-            if (isImageModel) {
+            const requestsNonImageOutput = options.output?.format === "json" ||
+                options.output?.format === "structured" ||
+                options.output?.format === "text";
+            if (isImageModel && !requestsNonImageOutput) {
                 logger.info(`Image generation model detected, routing to executeImageGeneration`, {
                     provider: this.providerName,
                     model: this.modelName,

package/dist/core/factory.js

@@ -7,7 +7,7 @@ import { ProviderRegistry } from "../factories/providerRegistry.js";
 import { getBestProvider } from "../utils/providerUtils.js";
 import { logger } from "../utils/logger.js";
 import { dynamicModelProvider } from "./dynamicModels.js";
-import { withTimeout } from "../utils/errorHandling.js";
+import { withTimeout, ErrorFactory } from "../utils/errorHandling.js";
 const componentIdentifier = "aiProviderFactory";
 const factoryTracer = tracers.factory;
 /**
@@ -34,7 +34,7 @@ export class AIProviderFactory {
         const functionTag = "AIProviderFactory.initializeDynamicProviderWithTimeout";
         const INIT_TIMEOUT = 10000; // 10 seconds total timeout for initialization
         try {
-            await withTimeout(dynamicModelProvider.initialize(), INIT_TIMEOUT, new Error("Dynamic provider initialization timeout"));
+            await withTimeout(dynamicModelProvider.initialize(), INIT_TIMEOUT, ErrorFactory.toolTimeout("dynamic-provider-init", INIT_TIMEOUT));
             logger.debug(`[${functionTag}] Dynamic model provider initialized successfully`);
         }
         catch (error) {
@@ -168,7 +168,7 @@ export class AIProviderFactory {
         }
     }
     static async createResolvedProvider(providerName, resolvedModelName, sdk, region, functionTag) {
-        await withTimeout(ProviderRegistry.registerAllProviders(), 30_000, new Error("Provider registration timed out"));
+        await withTimeout(ProviderRegistry.registerAllProviders(), 30_000, ErrorFactory.toolTimeout("provider-registration", 30_000));
         const normalizedName = this.normalizeProviderName(providerName);
         const finalModelName = resolvedModelName === "default" || resolvedModelName === null
             ? undefined
@@ -179,7 +179,7 @@ export class AIProviderFactory {
             resolvedModelName: resolvedModelName || "not resolved",
             finalModelName: finalModelName || "using provider default",
         });
-        const provider = await withTimeout(ProviderFactory.createProvider(normalizedName, finalModelName, sdk, region), 30_000, new Error(`Provider creation timed out for ${normalizedName}`));
+        const provider = await withTimeout(ProviderFactory.createProvider(normalizedName, finalModelName, sdk, region), 30_000, ErrorFactory.toolTimeout(`provider-creation:${normalizedName}`, 30_000));
         return { normalizedName, finalModelName, provider };
     }
     /**

package/dist/core/modules/ToolsManager.d.ts

@@ -35,6 +35,7 @@ export declare class ToolsManager {
      * Set session context for MCP tools
      */
     setSessionContext(sessionId?: string, userId?: string): void;
+    private emitToolEvent;
     /**
      * Set up tool executor for a provider to enable actual tool execution
      * @param sdk - The NeuroLinkSDK instance for tool execution

package/dist/core/modules/ToolsManager.js

@@ -16,6 +16,7 @@
  */
 import { tool as createAISDKTool, jsonSchema } from "ai";
 import { z } from "zod";
+import { createToolEventPayload } from "../toolEvents.js";
 import { tracers, ATTR, withSpan } from "../../telemetry/index.js";
 import { SpanStatusCode } from "@opentelemetry/api";
 import { logger } from "../../utils/logger.js";
@@ -50,6 +51,13 @@ export class ToolsManager {
         this.sessionId = sessionId;
         this.userId = userId;
     }
+    emitToolEvent(eventName, toolName, payload) {
+        if (this.neurolink?.getEventEmitter) {
+            this.neurolink
+                .getEventEmitter()
+                .emit(eventName, createToolEventPayload(toolName, payload));
+        }
+    }
     /**
      * Set up tool executor for a provider to enable actual tool execution
      * @param sdk - The NeuroLinkSDK instance for tool execution
@@ -175,27 +183,24 @@ export class ToolsManager {
                 tools[toolName] = {
                     ...directTool,
                     execute: async (params) => {
-                        // 🔧 EMIT TOOL START EVENT - Bedrock-compatible format
-                        if (this.neurolink?.getEventEmitter) {
-                            const emitter = this.neurolink.getEventEmitter();
-                            emitter.emit("tool:start", { tool: toolName, input: params });
-                        }
+                        const startTime = Date.now();
+                        this.emitToolEvent("tool:start", toolName, { input: params });
                         try {
                             const result = await originalExecute(params);
-                            // 🔧 EMIT TOOL END EVENT - Bedrock-compatible format
-                            if (this.neurolink?.getEventEmitter) {
-                                const emitter = this.neurolink.getEventEmitter();
-                                emitter.emit("tool:end", { tool: toolName, result });
-                            }
+                            this.emitToolEvent("tool:end", toolName, {
+                                result,
+                                success: true,
+                                responseTime: Date.now() - startTime,
+                            });
                             return result;
                         }
                         catch (error) {
-                            // 🔧 EMIT TOOL END EVENT FOR ERROR - Bedrock-compatible format
-                            if (this.neurolink?.getEventEmitter) {
-                                const emitter = this.neurolink.getEventEmitter();
-                                const errorMsg = error instanceof Error ? error.message : String(error);
-                                emitter.emit("tool:end", { tool: toolName, error: errorMsg });
-                            }
+                            const errorMsg = error instanceof Error ? error.message : String(error);
+                            this.emitToolEvent("tool:end", toolName, {
+                                error: errorMsg,
+                                success: false,
+                                responseTime: Date.now() - startTime,
+                            });
                             throw error;
                         }
                     },
@@ -443,48 +448,41 @@ export class ToolsManager {
                 description: tool.description || `External MCP tool ${tool.name}`,
                 inputSchema: finalSchema, // AI SDK v6 uses inputSchema (not parameters)
                 execute: async (params) => {
-                    // Emit tool start event
-                    if (this.neurolink?.getEventEmitter) {
-                        const emitter = this.neurolink.getEventEmitter();
-                        emitter.emit("tool:start", { tool: tool.name, input: params });
-                    }
+                    const startTime = Date.now();
+                    this.emitToolEvent("tool:start", tool.name, { input: params });
                     // Execute via NeuroLink's direct tool execution
                     if (this.neurolink &&
                         typeof this.neurolink.executeExternalMCPTool === "function") {
                         try {
                             const result = await this.neurolink.executeExternalMCPTool(tool.serverId || "unknown", tool.name, params);
-                            // Emit tool end event (success)
-                            if (this.neurolink?.getEventEmitter) {
-                                const emitter = this.neurolink.getEventEmitter();
-                                emitter.emit("tool:end", { tool: tool.name, result });
-                            }
+                            this.emitToolEvent("tool:end", tool.name, {
+                                result,
+                                success: true,
+                                responseTime: Date.now() - startTime,
+                            });
                             return result;
                         }
                         catch (mcpError) {
-                            // Emit tool end event (error)
-                            if (this.neurolink?.getEventEmitter) {
-                                const emitter = this.neurolink.getEventEmitter();
-                                const errorMsg = mcpError instanceof Error
-                                    ? mcpError.message
-                                    : String(mcpError);
-                                emitter.emit("tool:end", { tool: tool.name, error: errorMsg });
-                            }
+                            const errorMsg = mcpError instanceof Error ? mcpError.message : String(mcpError);
+                            this.emitToolEvent("tool:end", tool.name, {
+                                error: errorMsg,
+                                success: false,
+                                responseTime: Date.now() - startTime,
+                            });
                             logger.error(`External MCP tool failed: ${tool.name}`, {
                                 serverId: tool.serverId,
-                                error: mcpError instanceof Error
-                                    ? mcpError.message
-                                    : String(mcpError),
+                                error: errorMsg,
                             });
                             throw mcpError;
                         }
                     }
                     else {
                         const error = `Cannot execute external MCP tool: NeuroLink executeExternalMCPTool not available`;
-                        // Emit tool end event (error - no executor)
-                        if (this.neurolink?.getEventEmitter) {
-                            const emitter = this.neurolink.getEventEmitter();
-                            emitter.emit("tool:end", { tool: tool.name, error });
-                        }
+                        this.emitToolEvent("tool:end", tool.name, {
+                            error,
+                            success: false,
+                            responseTime: Date.now() - startTime,
+                        });
                         logger.error(error);
                         throw new Error(error);
                     }

package/dist/core/toolEvents.d.ts

@@ -0,0 +1,3 @@
+import type { ToolEventPayload } from "../types/index.js";
+export type { ToolEventPayload };
+export declare function createToolEventPayload(toolName: string, payload?: Omit<ToolEventPayload, "tool" | "toolName">): ToolEventPayload;

package/dist/core/toolEvents.js

@@ -0,0 +1,7 @@
+export function createToolEventPayload(toolName, payload = {}) {
+    return {
+        ...payload,
+        tool: toolName,
+        toolName,
+    };
+}

package/dist/evaluation/scorers/scorerRegistry.js

@@ -412,8 +412,9 @@ export class ScorerRegistry {
                 ScorerRegistry.initialized = true;
                 logger.debug(`Registered ${ScorerRegistry.scorers.size} built-in scorers (including aliases)`);
             }
-            finally {
-                // Keep initPromise for future callers to await
+            catch (err) {
+                ScorerRegistry.initPromise = null; // allow retry on next call
+                throw err;
             }
         })();
         return ScorerRegistry.initPromise;

package/dist/lib/core/baseProvider.js

@@ -131,9 +131,15 @@ export class BaseProvider {
                 }
             }
             // CRITICAL: Image generation models don't support real streaming
-            // Force fake streaming for image models to ensure image output is yielded
+            // Force fake streaming for image models to ensure image output is yielded.
+            // Skip this path when the caller explicitly requests non-image output (e.g.
+            // JSON analysis) so dual-mode models like gemini-3.1-flash-image-preview
+            // can still perform text/structured generation.
             const isImageModel = IMAGE_GENERATION_MODELS.some((m) => this.modelName.includes(m));
-            if (isImageModel) {
+            const requestsNonImageOutput = options.output?.format === "json" ||
+                options.output?.format === "structured" ||
+                options.output?.format === "text";
+            if (isImageModel && !requestsNonImageOutput) {
                 logger.info(`Image model detected, forcing fake streaming`, {
                     provider: this.providerName,
                     model: this.modelName,
@@ -537,7 +543,10 @@ export class BaseProvider {
                 return await this.handleVideoGeneration(options, startTime);
             }
             const isImageModel = IMAGE_GENERATION_MODELS.some((m) => this.modelName.includes(m));
-            if (isImageModel) {
+            const requestsNonImageOutput = options.output?.format === "json" ||
+                options.output?.format === "structured" ||
+                options.output?.format === "text";
+            if (isImageModel && !requestsNonImageOutput) {
                 logger.info(`Image generation model detected, routing to executeImageGeneration`, {
                     provider: this.providerName,
                     model: this.modelName,

package/dist/lib/core/factory.js

@@ -7,7 +7,7 @@ import { ProviderRegistry } from "../factories/providerRegistry.js";
 import { getBestProvider } from "../utils/providerUtils.js";
 import { logger } from "../utils/logger.js";
 import { dynamicModelProvider } from "./dynamicModels.js";
-import { withTimeout } from "../utils/errorHandling.js";
+import { withTimeout, ErrorFactory } from "../utils/errorHandling.js";
 import { AIProviderName } from "../constants/enums.js";
 const componentIdentifier = "aiProviderFactory";
 const factoryTracer = tracers.factory;
@@ -35,7 +35,7 @@ export class AIProviderFactory {
         const functionTag = "AIProviderFactory.initializeDynamicProviderWithTimeout";
         const INIT_TIMEOUT = 10000; // 10 seconds total timeout for initialization
         try {
-            await withTimeout(dynamicModelProvider.initialize(), INIT_TIMEOUT, new Error("Dynamic provider initialization timeout"));
+            await withTimeout(dynamicModelProvider.initialize(), INIT_TIMEOUT, ErrorFactory.toolTimeout("dynamic-provider-init", INIT_TIMEOUT));
             logger.debug(`[${functionTag}] Dynamic model provider initialized successfully`);
         }
         catch (error) {
@@ -169,7 +169,7 @@ export class AIProviderFactory {
         }
     }
     static async createResolvedProvider(providerName, resolvedModelName, sdk, region, functionTag) {
-        await withTimeout(ProviderRegistry.registerAllProviders(), 30_000, new Error("Provider registration timed out"));
+        await withTimeout(ProviderRegistry.registerAllProviders(), 30_000, ErrorFactory.toolTimeout("provider-registration", 30_000));
         const normalizedName = this.normalizeProviderName(providerName);
         const finalModelName = resolvedModelName === "default" || resolvedModelName === null
             ? undefined
@@ -180,7 +180,7 @@ export class AIProviderFactory {
             resolvedModelName: resolvedModelName || "not resolved",
             finalModelName: finalModelName || "using provider default",
         });
-        const provider = await withTimeout(ProviderFactory.createProvider(normalizedName, finalModelName, sdk, region), 30_000, new Error(`Provider creation timed out for ${normalizedName}`));
+        const provider = await withTimeout(ProviderFactory.createProvider(normalizedName, finalModelName, sdk, region), 30_000, ErrorFactory.toolTimeout(`provider-creation:${normalizedName}`, 30_000));
         return { normalizedName, finalModelName, provider };
     }
     /**

package/dist/lib/core/modules/ToolsManager.d.ts

@@ -35,6 +35,7 @@ export declare class ToolsManager {
      * Set session context for MCP tools
      */
     setSessionContext(sessionId?: string, userId?: string): void;
+    private emitToolEvent;
     /**
      * Set up tool executor for a provider to enable actual tool execution
      * @param sdk - The NeuroLinkSDK instance for tool execution

package/dist/lib/core/modules/ToolsManager.js

@@ -16,6 +16,7 @@
  */
 import { tool as createAISDKTool, jsonSchema } from "ai";
 import { z } from "zod";
+import { createToolEventPayload } from "../toolEvents.js";
 import { tracers, ATTR, withSpan } from "../../telemetry/index.js";
 import { SpanStatusCode } from "@opentelemetry/api";
 import { logger } from "../../utils/logger.js";
@@ -50,6 +51,13 @@ export class ToolsManager {
         this.sessionId = sessionId;
         this.userId = userId;
     }
+    emitToolEvent(eventName, toolName, payload) {
+        if (this.neurolink?.getEventEmitter) {
+            this.neurolink
+                .getEventEmitter()
+                .emit(eventName, createToolEventPayload(toolName, payload));
+        }
+    }
     /**
      * Set up tool executor for a provider to enable actual tool execution
      * @param sdk - The NeuroLinkSDK instance for tool execution
@@ -175,27 +183,24 @@ export class ToolsManager {
                 tools[toolName] = {
                     ...directTool,
                     execute: async (params) => {
-                        // 🔧 EMIT TOOL START EVENT - Bedrock-compatible format
-                        if (this.neurolink?.getEventEmitter) {
-                            const emitter = this.neurolink.getEventEmitter();
-                            emitter.emit("tool:start", { tool: toolName, input: params });
-                        }
+                        const startTime = Date.now();
+                        this.emitToolEvent("tool:start", toolName, { input: params });
                         try {
                             const result = await originalExecute(params);
-                            // 🔧 EMIT TOOL END EVENT - Bedrock-compatible format
-                            if (this.neurolink?.getEventEmitter) {
-                                const emitter = this.neurolink.getEventEmitter();
-                                emitter.emit("tool:end", { tool: toolName, result });
-                            }
+                            this.emitToolEvent("tool:end", toolName, {
+                                result,
+                                success: true,
+                                responseTime: Date.now() - startTime,
+                            });
                             return result;
                         }
                         catch (error) {
-                            // 🔧 EMIT TOOL END EVENT FOR ERROR - Bedrock-compatible format
-                            if (this.neurolink?.getEventEmitter) {
-                                const emitter = this.neurolink.getEventEmitter();
-                                const errorMsg = error instanceof Error ? error.message : String(error);
-                                emitter.emit("tool:end", { tool: toolName, error: errorMsg });
-                            }
+                            const errorMsg = error instanceof Error ? error.message : String(error);
+                            this.emitToolEvent("tool:end", toolName, {
+                                error: errorMsg,
+                                success: false,
+                                responseTime: Date.now() - startTime,
+                            });
                             throw error;
                         }
                     },
@@ -443,48 +448,41 @@ export class ToolsManager {
                 description: tool.description || `External MCP tool ${tool.name}`,
                 inputSchema: finalSchema, // AI SDK v6 uses inputSchema (not parameters)
                 execute: async (params) => {
-                    // Emit tool start event
-                    if (this.neurolink?.getEventEmitter) {
-                        const emitter = this.neurolink.getEventEmitter();
-                        emitter.emit("tool:start", { tool: tool.name, input: params });
-                    }
+                    const startTime = Date.now();
+                    this.emitToolEvent("tool:start", tool.name, { input: params });
                     // Execute via NeuroLink's direct tool execution
                     if (this.neurolink &&
                         typeof this.neurolink.executeExternalMCPTool === "function") {
                         try {
                             const result = await this.neurolink.executeExternalMCPTool(tool.serverId || "unknown", tool.name, params);
-                            // Emit tool end event (success)
-                            if (this.neurolink?.getEventEmitter) {
-                                const emitter = this.neurolink.getEventEmitter();
-                                emitter.emit("tool:end", { tool: tool.name, result });
-                            }
+                            this.emitToolEvent("tool:end", tool.name, {
+                                result,
+                                success: true,
+                                responseTime: Date.now() - startTime,
+                            });
                             return result;
                         }
                         catch (mcpError) {
-                            // Emit tool end event (error)
-                            if (this.neurolink?.getEventEmitter) {
-                                const emitter = this.neurolink.getEventEmitter();
-                                const errorMsg = mcpError instanceof Error
-                                    ? mcpError.message
-                                    : String(mcpError);
-                                emitter.emit("tool:end", { tool: tool.name, error: errorMsg });
-                            }
+                            const errorMsg = mcpError instanceof Error ? mcpError.message : String(mcpError);
+                            this.emitToolEvent("tool:end", tool.name, {
+                                error: errorMsg,
+                                success: false,
+                                responseTime: Date.now() - startTime,
+                            });
                             logger.error(`External MCP tool failed: ${tool.name}`, {
                                 serverId: tool.serverId,
-                                error: mcpError instanceof Error
-                                    ? mcpError.message
-                                    : String(mcpError),
+                                error: errorMsg,
                             });
                             throw mcpError;
                         }
                     }
                     else {
                         const error = `Cannot execute external MCP tool: NeuroLink executeExternalMCPTool not available`;
-                        // Emit tool end event (error - no executor)
-                        if (this.neurolink?.getEventEmitter) {
-                            const emitter = this.neurolink.getEventEmitter();
-                            emitter.emit("tool:end", { tool: tool.name, error });
-                        }
+                        this.emitToolEvent("tool:end", tool.name, {
+                            error,
+                            success: false,
+                            responseTime: Date.now() - startTime,
+                        });
                         logger.error(error);
                         throw new Error(error);
                     }

package/dist/lib/core/toolEvents.d.ts

@@ -0,0 +1,3 @@
+import type { ToolEventPayload } from "../types/index.js";
+export type { ToolEventPayload };
+export declare function createToolEventPayload(toolName: string, payload?: Omit<ToolEventPayload, "tool" | "toolName">): ToolEventPayload;

package/dist/lib/core/toolEvents.js

@@ -0,0 +1,8 @@
+export function createToolEventPayload(toolName, payload = {}) {
+    return {
+        ...payload,
+        tool: toolName,
+        toolName,
+    };
+}
+//# sourceMappingURL=toolEvents.js.map

package/dist/lib/evaluation/scorers/scorerRegistry.js

@@ -412,8 +412,9 @@ export class ScorerRegistry {
                 ScorerRegistry.initialized = true;
                 logger.debug(`Registered ${ScorerRegistry.scorers.size} built-in scorers (including aliases)`);
             }
-            finally {
-                // Keep initPromise for future callers to await
+            catch (err) {
+                ScorerRegistry.initPromise = null; // allow retry on next call
+                throw err;
             }
         })();
         return ScorerRegistry.initPromise;