@juspay/neurolink 7.46.0 → 7.47.1

package/dist/lib/utils/imageProcessor.js

@@ -151,6 +151,8 @@ export class ImageProcessor {
                     bmp: "image/bmp",
                     tiff: "image/tiff",
                     tif: "image/tiff",
+                    svg: "image/svg+xml",
+                    avif: "image/avif",
                 };
                 return imageTypes[extension || ""] || "image/jpeg";
             }
@@ -183,6 +185,21 @@ export class ImageProcessor {
                         return "image/webp";
                     }
                 }
+                // SVG: check for "<svg" or "<?xml" at start (text-based)
+                if (input.length >= 4) {
+                    const start = input.subarray(0, 4).toString();
+                    if (start === "<svg" || start === "<?xm") {
+                        return "image/svg+xml";
+                    }
+                }
+                // AVIF: check for "ftypavif" signature at bytes 4-11
+                if (input.length >= 12) {
+                    const ftyp = input.subarray(4, 8).toString();
+                    const brand = input.subarray(8, 12).toString();
+                    if (ftyp === "ftyp" && brand === "avif") {
+                        return "image/avif";
+                    }
+                }
             }
             return "image/jpeg"; // Default fallback
         }
@@ -217,6 +234,8 @@ export class ImageProcessor {
             "image/webp",
             "image/bmp",
             "image/tiff",
+            "image/svg+xml",
+            "image/avif",
         ];
         return supportedFormats.includes(mediaType.toLowerCase());
     }
@@ -332,14 +351,7 @@ export const imageUtils = {
     /**
      * Check if a string is base64 encoded
      */
-    isBase64: (str) => {
-        try {
-            return btoa(atob(str)) === str;
-        }
-        catch {
-            return false;
-        }
-    },
+    isBase64: (str) => imageUtils.isValidBase64(str),
     /**
      * Extract file extension from filename or URL
      */
@@ -359,4 +371,143 @@ export const imageUtils = {
         const i = Math.floor(Math.log(bytes) / Math.log(k));
         return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + " " + sizes[i];
     },
+    /**
+     * Convert Buffer to base64 string
+     */
+    bufferToBase64: (buffer) => {
+        return buffer.toString("base64");
+    },
+    /**
+     * Convert base64 string to Buffer
+     */
+    base64ToBuffer: (base64) => {
+        // Remove data URI prefix if present
+        const cleanBase64 = base64.includes(",") ? base64.split(",")[1] : base64;
+        return Buffer.from(cleanBase64, "base64");
+    },
+    /**
+     * Convert file path to base64 data URI
+     */
+    fileToBase64DataUri: async (filePath, maxBytes = 10 * 1024 * 1024) => {
+        try {
+            const fs = await import("fs/promises");
+            // File existence and type validation
+            const stat = await fs.stat(filePath);
+            if (!stat.isFile()) {
+                throw new Error("Not a file");
+            }
+            // Size check before reading - prevent memory exhaustion
+            if (stat.size > maxBytes) {
+                throw new Error(`File too large: ${stat.size} bytes (max: ${maxBytes} bytes)`);
+            }
+            const buffer = await fs.readFile(filePath);
+            // Enhanced MIME detection: try buffer content first, fallback to filename
+            const mimeType = ImageProcessor.detectImageType(buffer) ||
+                ImageProcessor.detectImageType(filePath);
+            const base64 = buffer.toString("base64");
+            return `data:${mimeType};base64,${base64}`;
+        }
+        catch (error) {
+            throw new Error(`Failed to convert file to base64: ${error instanceof Error ? error.message : "Unknown error"}`);
+        }
+    },
+    /**
+     * Convert URL to base64 data URI by downloading the image
+     */
+    urlToBase64DataUri: async (url, { timeoutMs = 15000, maxBytes = 10 * 1024 * 1024 } = {}) => {
+        try {
+            // Basic protocol whitelist
+            if (!/^https?:\/\//i.test(url)) {
+                throw new Error("Unsupported protocol");
+            }
+            const controller = new AbortController();
+            const t = setTimeout(() => controller.abort(), timeoutMs);
+            try {
+                const response = await fetch(url, { signal: controller.signal });
+                if (!response.ok) {
+                    throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+                }
+                const contentType = response.headers.get("content-type") || "";
+                if (!/^image\//i.test(contentType)) {
+                    throw new Error(`Unsupported content-type: ${contentType || "unknown"}`);
+                }
+                const len = Number(response.headers.get("content-length") || 0);
+                if (len && len > maxBytes) {
+                    throw new Error(`Content too large: ${len} bytes`);
+                }
+                const buffer = await response.arrayBuffer();
+                if (buffer.byteLength > maxBytes) {
+                    throw new Error(`Downloaded content too large: ${buffer.byteLength} bytes`);
+                }
+                const base64 = Buffer.from(buffer).toString("base64");
+                return `data:${contentType || "image/jpeg"};base64,${base64}`;
+            }
+            finally {
+                clearTimeout(t);
+            }
+        }
+        catch (error) {
+            throw new Error(`Failed to download and convert URL to base64: ${error instanceof Error ? error.message : "Unknown error"}`);
+        }
+    },
+    /**
+     * Extract base64 data from data URI
+     */
+    extractBase64FromDataUri: (dataUri) => {
+        if (!dataUri.includes(",")) {
+            return dataUri; // Already just base64
+        }
+        return dataUri.split(",")[1];
+    },
+    /**
+     * Extract MIME type from data URI
+     */
+    extractMimeTypeFromDataUri: (dataUri) => {
+        const match = dataUri.match(/^data:([^;]+);base64,/);
+        return match ? match[1] : "image/jpeg";
+    },
+    /**
+     * Create data URI from base64 and MIME type
+     */
+    createDataUri: (base64, mimeType = "image/jpeg") => {
+        // Remove data URI prefix if already present
+        const cleanBase64 = base64.includes(",") ? base64.split(",")[1] : base64;
+        return `data:${mimeType};base64,${cleanBase64}`;
+    },
+    /**
+     * Validate base64 string format
+     */
+    isValidBase64: (str) => {
+        try {
+            // Remove data URI prefix if present
+            const cleanBase64 = str.includes(",") ? str.split(",")[1] : str;
+            // Check if it's valid base64
+            const decoded = Buffer.from(cleanBase64, "base64");
+            const reencoded = decoded.toString("base64");
+            // Remove padding for comparison (base64 can have different padding)
+            const normalizeBase64 = (b64) => b64.replace(/=+$/, "");
+            return normalizeBase64(cleanBase64) === normalizeBase64(reencoded);
+        }
+        catch {
+            return false;
+        }
+    },
+    /**
+     * Get base64 string size in bytes
+     */
+    getBase64Size: (base64) => {
+        // Remove data URI prefix if present
+        const cleanBase64 = base64.includes(",") ? base64.split(",")[1] : base64;
+        return Buffer.byteLength(cleanBase64, "base64");
+    },
+    /**
+     * Compress base64 image by reducing quality (basic implementation)
+     * Note: This is a placeholder - for production use, consider using sharp or similar
+     */
+    compressBase64: (base64, _quality = 0.8) => {
+        // This is a basic implementation that just returns the original
+        // In a real implementation, you'd use an image processing library
+        logger.warn("Base64 compression not implemented - returning original");
+        return base64;
+    },
 };

package/dist/lib/utils/messageBuilder.d.ts

@@ -7,13 +7,12 @@ import type { MultimodalChatMessage } from "../types/conversation.js";
 import type { TextGenerationOptions } from "../types/index.js";
 import type { StreamOptions } from "../types/streamTypes.js";
 import type { GenerateOptions } from "../types/generateTypes.js";
+import type { CoreMessage } from "ai";
 /**
- * Core message type compatible with AI SDK
+ * Type-safe conversion from MultimodalChatMessage[] to CoreMessage[]
+ * Filters out invalid content and ensures strict CoreMessage contract compliance
  */
-type CoreMessage = {
-    role: "user" | "assistant" | "system";
-    content: string;
-};
+export declare function convertToCoreMessages(messages: MultimodalChatMessage[]): CoreMessage[];
 /**
  * Build a properly formatted message array for AI providers
  * Combines system prompt, conversation history, and current user prompt
@@ -25,4 +24,3 @@ export declare function buildMessagesArray(options: TextGenerationOptions | Stre
  * Detects when images are present and routes through provider adapter
  */
 export declare function buildMultimodalMessagesArray(options: GenerateOptions, provider: string, model: string): Promise<MultimodalChatMessage[]>;
-export {};

package/dist/lib/utils/messageBuilder.js

@@ -8,6 +8,147 @@ import { ProviderImageAdapter, MultimodalLogger, } from "../adapters/providerIma
 import { logger } from "./logger.js";
 import { request } from "undici";
 import { readFileSync, existsSync } from "fs";
+/**
+ * Type guard for validating message roles
+ */
+function isValidRole(role) {
+    return (typeof role === "string" &&
+        (role === "user" || role === "assistant" || role === "system"));
+}
+/**
+ * Type guard for validating content items
+ */
+function isValidContentItem(item) {
+    if (!item || typeof item !== "object") {
+        return false;
+    }
+    const contentItem = item;
+    if (contentItem.type === "text") {
+        return typeof contentItem.text === "string";
+    }
+    if (contentItem.type === "image") {
+        return (typeof contentItem.image === "string" &&
+            (contentItem.mimeType === undefined ||
+                typeof contentItem.mimeType === "string"));
+    }
+    return false;
+}
+/**
+ * Safely convert content item to AI SDK content format
+ */
+function convertContentItem(item) {
+    if (!isValidContentItem(item)) {
+        return null;
+    }
+    const contentItem = item;
+    if (contentItem.type === "text" && typeof contentItem.text === "string") {
+        return { type: "text", text: contentItem.text };
+    }
+    if (contentItem.type === "image" && typeof contentItem.image === "string") {
+        return {
+            type: "image",
+            image: contentItem.image,
+            ...(contentItem.mimeType && { mimeType: contentItem.mimeType }),
+        };
+    }
+    return null;
+}
+/**
+ * Type-safe conversion from MultimodalChatMessage[] to CoreMessage[]
+ * Filters out invalid content and ensures strict CoreMessage contract compliance
+ */
+export function convertToCoreMessages(messages) {
+    return messages
+        .map((msg) => {
+        // Validate role
+        if (!isValidRole(msg.role)) {
+            logger.warn("Invalid message role found, skipping", { role: msg.role });
+            return null;
+        }
+        // Handle string content
+        if (typeof msg.content === "string") {
+            // Create properly typed discriminated union messages
+            if (msg.role === "system") {
+                return {
+                    role: "system",
+                    content: msg.content,
+                };
+            }
+            else if (msg.role === "user") {
+                return {
+                    role: "user",
+                    content: msg.content,
+                };
+            }
+            else if (msg.role === "assistant") {
+                return {
+                    role: "assistant",
+                    content: msg.content,
+                };
+            }
+        }
+        // Handle array content (multimodal) - only user messages support full multimodal content
+        if (Array.isArray(msg.content)) {
+            const validContent = msg.content
+                .map(convertContentItem)
+                .filter((item) => item !== null);
+            // If no valid content items, skip the message
+            if (validContent.length === 0) {
+                logger.warn("No valid content items found in multimodal message, skipping");
+                return null;
+            }
+            if (msg.role === "user") {
+                // User messages support both text and image content
+                return {
+                    role: "user",
+                    content: validContent,
+                };
+            }
+            else if (msg.role === "assistant") {
+                // Assistant messages only support text content, filter out images
+                const textOnlyContent = validContent.filter((item) => item.type === "text");
+                if (textOnlyContent.length === 0) {
+                    // If no text content, convert to empty string
+                    return {
+                        role: "assistant",
+                        content: "",
+                    };
+                }
+                else if (textOnlyContent.length === 1) {
+                    // Single text item, use string content
+                    return {
+                        role: "assistant",
+                        content: textOnlyContent[0].text,
+                    };
+                }
+                else {
+                    // Multiple text items, concatenate them
+                    const combinedText = textOnlyContent
+                        .map((item) => item.text)
+                        .join(" ");
+                    return {
+                        role: "assistant",
+                        content: combinedText,
+                    };
+                }
+            }
+            else {
+                // System messages cannot have multimodal content, convert to text
+                const textContent = validContent.find((item) => item.type === "text")?.text || "";
+                return {
+                    role: "system",
+                    content: textContent,
+                };
+            }
+        }
+        // Invalid content type
+        logger.warn("Invalid message content type found, skipping", {
+            contentType: typeof msg.content,
+        });
+        return null;
+    })
+        .filter((msg) => msg !== null);
+}
 /**
  * Convert ChatMessage to CoreMessage for AI SDK compatibility
  */
@@ -84,7 +225,10 @@ export async function buildMultimodalMessagesArray(options, provider, model) {
     // If no images, use standard message building and convert to MultimodalChatMessage[]
     if (!hasImages) {
         const standardMessages = buildMessagesArray(options);
-        return standardMessages.map((msg) => ({ ...msg, content: msg.content }));
+        return standardMessages.map((msg) => ({
+            role: msg.role,
+            content: typeof msg.content === "string" ? msg.content : msg.content,
+        }));
     }
     // Validate provider supports vision
     if (!ProviderImageAdapter.supportsVision(provider, model)) {

package/dist/neurolink.d.ts

@@ -6,6 +6,7 @@
  * Uses real MCP infrastructure for tool discovery and execution.
  */
 import type { TextGenerationOptions, TextGenerationResult } from "./types/index.js";
+import { MCPToolRegistry } from "./mcp/toolRegistry.js";
 import type { GenerateOptions, GenerateResult } from "./types/generateTypes.js";
 import type { StreamOptions, StreamResult } from "./types/streamTypes.js";
 import type { MCPServerInfo, MCPExecutableTool } from "./types/mcpTypes.js";
@@ -46,6 +47,7 @@ export interface MCPStatus {
 export declare class NeuroLink {
     private mcpInitialized;
     private emitter;
+    private toolRegistry;
     private autoDiscoveredServerInfos;
     private externalServerManager;
     private toolCache;
@@ -99,6 +101,7 @@ export declare class NeuroLink {
      * @param config.hitl.dangerousActions - Keywords that trigger confirmation (default: ['delete', 'remove', 'drop'])
      * @param config.hitl.timeout - Confirmation timeout in milliseconds (default: 30000)
      * @param config.hitl.allowArgumentModification - Allow users to modify tool parameters (default: true)
+     * @param config.toolRegistry - Optional tool registry instance for advanced use cases (default: new MCPToolRegistry())
      *
      * @example
      * ```typescript
@@ -139,6 +142,7 @@ export declare class NeuroLink {
         conversationMemory?: Partial<ConversationMemoryConfig>;
         enableOrchestration?: boolean;
         hitl?: HITLConfig;
+        toolRegistry?: MCPToolRegistry;
     });
     /**
      * Initialize provider registry with security settings

package/dist/neurolink.js

@@ -18,7 +18,7 @@ import { mcpLogger } from "./utils/logger.js";
 import { SYSTEM_LIMITS } from "./core/constants.js";
 import { NANOSECOND_TO_MS_DIVISOR, TOOL_TIMEOUTS, RETRY_ATTEMPTS, RETRY_DELAYS, CIRCUIT_BREAKER, CIRCUIT_BREAKER_RESET_MS, MEMORY_THRESHOLDS, PROVIDER_TIMEOUTS, PERFORMANCE_THRESHOLDS, } from "./constants/index.js";
 import pLimit from "p-limit";
-import { toolRegistry } from "./mcp/toolRegistry.js";
+import { MCPToolRegistry } from "./mcp/toolRegistry.js";
 import { logger } from "./utils/logger.js";
 import { getBestProvider } from "./utils/providerUtils.js";
 import { ProviderRegistry } from "./factories/providerRegistry.js";
@@ -45,6 +45,7 @@ import { isZodSchema } from "./utils/schemaConversion.js";
 export class NeuroLink {
     mcpInitialized = false;
     emitter = new EventEmitter();
+    toolRegistry;
     autoDiscoveredServerInfos = [];
     // External MCP server management
     externalServerManager;
@@ -140,6 +141,7 @@ export class NeuroLink {
      * @param config.hitl.dangerousActions - Keywords that trigger confirmation (default: ['delete', 'remove', 'drop'])
      * @param config.hitl.timeout - Confirmation timeout in milliseconds (default: 30000)
      * @param config.hitl.allowArgumentModification - Allow users to modify tool parameters (default: true)
+     * @param config.toolRegistry - Optional tool registry instance for advanced use cases (default: new MCPToolRegistry())
      *
      * @example
      * ```typescript
@@ -177,6 +179,7 @@ export class NeuroLink {
      * @throws {Error} When HITL configuration is invalid (if enabled)
      */
     constructor(config) {
+        this.toolRegistry = config?.toolRegistry || new MCPToolRegistry();
         // Initialize orchestration setting
         this.enableOrchestration = config?.enableOrchestration ?? false;
         // Read tool cache duration from environment variables, with a default
@@ -278,7 +281,7 @@ export class NeuroLink {
                 // Initialize HITL manager
                 this.hitlManager = new HITLManager(config.hitl);
                 // Inject HITL manager into tool registry
-                toolRegistry.setHITLManager(this.hitlManager);
+                this.toolRegistry.setHITLManager(this.hitlManager);
                 // Inject HITL manager into external server manager
                 this.externalServerManager.setHITLManager(this.hitlManager);
                 // Set up HITL event forwarding to main emitter
@@ -627,7 +630,7 @@ export class NeuroLink {
                 mcpLogger.debug("Direct tools server are disabled via environment variable.");
             }
             else {
-                await toolRegistry.registerServer("neurolink-direct", directToolsServer);
+                await this.toolRegistry.registerServer("neurolink-direct", directToolsServer);
                 mcpLogger.debug("[NeuroLink] Direct tools server registered successfully", {
                     serverId: "neurolink-direct",
                 });
@@ -1371,7 +1374,7 @@ export class NeuroLink {
                     mcpInitialized: this.mcpInitialized,
                     mcpComponents: {
                         hasExternalServerManager: !!this.externalServerManager,
-                        hasToolRegistry: !!toolRegistry,
+                        hasToolRegistry: !!this.toolRegistry,
                         hasProviderRegistry: !!AIProviderFactory,
                     },
                     fallbackReason: "MCP_NOT_INITIALIZED",
@@ -2403,7 +2406,7 @@ export class NeuroLink {
             // SMART DEFAULTS: Use utility to eliminate boilerplate creation
             const mcpServerInfo = createCustomToolServerInfo(name, convertedTool);
             // Register with toolRegistry using MCPServerInfo directly
-            toolRegistry.registerServer(mcpServerInfo);
+            this.toolRegistry.registerServer(mcpServerInfo);
             // Emit tool registration success event
             this.emitter.emit("tools-register:end", {
                 toolName: name,
@@ -2475,7 +2478,7 @@ export class NeuroLink {
     unregisterTool(name) {
         this.invalidateToolCache(); // Invalidate cache when a tool is unregistered
         const serverId = `custom-tool-${name}`;
-        const removed = toolRegistry.unregisterServer(serverId);
+        const removed = this.toolRegistry.unregisterServer(serverId);
         if (removed) {
             logger.info(`Unregistered custom tool: ${name}`);
         }
@@ -2487,7 +2490,7 @@ export class NeuroLink {
      */
     getCustomTools() {
         // Get tools from toolRegistry with smart category detection
-        const customTools = toolRegistry.getToolsByCategory(detectCategory({ isCustomTool: true }));
+        const customTools = this.toolRegistry.getToolsByCategory(detectCategory({ isCustomTool: true }));
         const toolMap = new Map();
         for (const tool of customTools) {
             const effectiveSchema = tool.inputSchema || tool.parameters;
@@ -2545,7 +2548,7 @@ export class NeuroLink {
                         hasShopId: !!executionContext.shopId,
                         sessionId: executionContext.sessionId,
                     });
-                    return await toolRegistry.executeTool(tool.name, params, executionContext);
+                    return await this.toolRegistry.executeTool(tool.name, params, executionContext);
                 },
             });
         }
@@ -2566,7 +2569,7 @@ export class NeuroLink {
                 serverInfo.tools = [];
             }
             // ZERO CONVERSIONS: Pass MCPServerInfo directly to toolRegistry
-            await toolRegistry.registerServer(serverInfo);
+            await this.toolRegistry.registerServer(serverInfo);
             mcpLogger.info(`[NeuroLink] Successfully registered in-memory server: ${serverId}`, {
                 category: serverInfo.metadata?.category,
                 provider: serverInfo.metadata?.provider,
@@ -2584,7 +2587,7 @@ export class NeuroLink {
      */
     getInMemoryServers() {
         // Get in-memory servers from toolRegistry
-        const serverInfos = toolRegistry.getBuiltInServerInfos();
+        const serverInfos = this.toolRegistry.getBuiltInServerInfos();
         const serverMap = new Map();
         for (const serverInfo of serverInfos) {
             if (detectCategory({
@@ -2603,7 +2606,7 @@ export class NeuroLink {
      */
     getInMemoryServerInfos() {
         // Get in-memory servers from centralized tool registry
-        const allServers = toolRegistry.getBuiltInServerInfos();
+        const allServers = this.toolRegistry.getBuiltInServerInfos();
         return allServers.filter((server) => detectCategory({
             existingCategory: server.metadata?.category,
             serverId: server.id,
@@ -2855,7 +2858,7 @@ export class NeuroLink {
                 storedContextKeys: Object.keys(storedContext),
                 finalContextKeys: Object.keys(context),
             });
-            const result = (await toolRegistry.executeTool(toolName, params, context));
+            const result = (await this.toolRegistry.executeTool(toolName, params, context));
             // ADD: Check if result indicates a failure and emit error event
             if (result &&
                 typeof result === "object" &&
@@ -2905,9 +2908,9 @@ export class NeuroLink {
             getAllToolsHrTimeStart: getAllToolsHrTimeStart.toString(),
             // 🔧 Tool registry state
             toolRegistryState: {
-                hasToolRegistry: !!toolRegistry,
+                hasToolRegistry: !!this.toolRegistry,
                 toolRegistrySize: 0, // Not accessible as size property
-                toolRegistryType: toolRegistry?.constructor?.name || "NOT_SET",
+                toolRegistryType: this.toolRegistry?.constructor?.name || "NOT_SET",
                 hasExternalServerManager: !!this.externalServerManager,
                 externalServerManagerType: this.externalServerManager?.constructor?.name || "NOT_SET",
             },
@@ -2926,7 +2929,7 @@ export class NeuroLink {
             // Optimized: Collect all tools with minimal object creation
             const allTools = new Map();
             // 1. Add MCP server tools (built-in direct tools)
-            const mcpToolsRaw = await toolRegistry.listTools();
+            const mcpToolsRaw = await this.toolRegistry.listTools();
             for (const tool of mcpToolsRaw) {
                 if (!allTools.has(tool.name)) {
                     const optimizedTool = optimizeToolForCollection(tool, {
@@ -2936,7 +2939,7 @@ export class NeuroLink {
                 }
             }
             // 2. Add custom tools from this NeuroLink instance
-            const customToolsRaw = toolRegistry.getToolsByCategory(detectCategory({ isCustomTool: true }));
+            const customToolsRaw = this.toolRegistry.getToolsByCategory(detectCategory({ isCustomTool: true }));
             for (const tool of customToolsRaw) {
                 if (!allTools.has(tool.name)) {
                     const optimizedTool = optimizeToolForCollection(tool, {
@@ -2952,7 +2955,7 @@ export class NeuroLink {
                 }
             }
             // 3. Add tools from in-memory MCP servers
-            const inMemoryToolsRaw = toolRegistry.getToolsByCategory("in-memory");
+            const inMemoryToolsRaw = this.toolRegistry.getToolsByCategory("in-memory");
             for (const tool of inMemoryToolsRaw) {
                 if (!allTools.has(tool.name)) {
                     const optimizedTool = optimizeToolForCollection(tool, {
@@ -3231,13 +3234,13 @@ export class NeuroLink {
             // Initialize MCP if not already initialized (loads external servers from config)
             await this.initializeMCP();
             // Get built-in tools
-            const allTools = await toolRegistry.listTools();
+            const allTools = await this.toolRegistry.listTools();
             // Get external MCP server statistics
             const externalStats = this.externalServerManager.getStatistics();
             // DIRECT RETURNS - ZERO conversion
             const externalMCPServers = this.externalServerManager.listServers();
             const inMemoryServerInfos = this.getInMemoryServerInfos();
-            const builtInServerInfos = toolRegistry.getBuiltInServerInfos();
+            const builtInServerInfos = this.toolRegistry.getBuiltInServerInfos();
             const autoDiscoveredServerInfos = this.getAutoDiscoveredServerInfos();
             // Calculate totals
             const totalServers = externalMCPServers.length +
@@ -3255,7 +3258,7 @@ export class NeuroLink {
                 autoDiscoveredCount: autoDiscoveredServerInfos.length,
                 totalTools,
                 autoDiscoveredServers: autoDiscoveredServerInfos,
-                customToolsCount: toolRegistry.getToolsByCategory(detectCategory({ isCustomTool: true })).length,
+                customToolsCount: this.toolRegistry.getToolsByCategory(detectCategory({ isCustomTool: true })).length,
                 inMemoryServersCount: inMemoryServerInfos.length,
                 externalMCPServersCount: externalMCPServers.length,
                 externalMCPConnectedCount: externalStats.connectedServers,
@@ -3271,7 +3274,7 @@ export class NeuroLink {
                 autoDiscoveredCount: 0,
                 totalTools: 0,
                 autoDiscoveredServers: [],
-                customToolsCount: toolRegistry.getToolsByCategory(detectCategory({ isCustomTool: true })).length,
+                customToolsCount: this.toolRegistry.getToolsByCategory(detectCategory({ isCustomTool: true })).length,
                 inMemoryServersCount: 0,
                 externalMCPServersCount: 0,
                 externalMCPConnectedCount: 0,
@@ -3290,7 +3293,7 @@ export class NeuroLink {
         return [
             ...this.externalServerManager.listServers(), // Direct return
             ...this.getInMemoryServerInfos(), // Direct return
-            ...toolRegistry.getBuiltInServerInfos(), // Direct return
+            ...this.toolRegistry.getBuiltInServerInfos(), // Direct return
             ...this.getAutoDiscoveredServerInfos(), // Direct return
         ];
     }
@@ -3303,7 +3306,7 @@ export class NeuroLink {
         try {
             // Test built-in tools
             if (serverId === "neurolink-direct") {
-                const tools = await toolRegistry.listTools();
+                const tools = await this.toolRegistry.listTools();
                 return tools.length > 0;
             }
             // Test in-memory servers
@@ -3480,7 +3483,7 @@ export class NeuroLink {
         const tools = {};
         let healthyCount = 0;
         // Get all tool names from toolRegistry
-        const allTools = await toolRegistry.listTools();
+        const allTools = await this.toolRegistry.listTools();
         const allToolNames = new Set(allTools.map((tool) => tool.name));
         for (const toolName of allToolNames) {
             const metrics = this.toolExecutionMetrics.get(toolName);
@@ -3908,7 +3911,7 @@ export class NeuroLink {
         try {
             const externalTools = this.externalServerManager.getServerTools(serverId);
             for (const tool of externalTools) {
-                toolRegistry.removeTool(tool.name);
+                this.toolRegistry.removeTool(tool.name);
                 mcpLogger.debug(`[NeuroLink] Unregistered external MCP tool from main registry: ${tool.name}`);
             }
         }
@@ -3921,7 +3924,7 @@ export class NeuroLink {
      */
     unregisterExternalMCPToolFromRegistry(toolName) {
         try {
-            toolRegistry.removeTool(toolName);
+            this.toolRegistry.removeTool(toolName);
             mcpLogger.debug(`[NeuroLink] Unregistered external MCP tool from main registry: ${toolName}`);
         }
         catch (error) {
@@ -3979,7 +3982,7 @@ export class NeuroLink {
         try {
             const externalTools = this.externalServerManager.getAllTools();
             for (const tool of externalTools) {
-                toolRegistry.removeTool(tool.name);
+                this.toolRegistry.removeTool(tool.name);
             }
             mcpLogger.debug(`[NeuroLink] Unregistered ${externalTools.length} external MCP tools from main registry`);
         }