@juspay/neurolink 5.1.0 → 5.2.0

package/dist/lib/factories/provider-registry.js

@@ -0,0 +1,107 @@
+import { ProviderFactory } from "./provider-factory.js";
+// ✅ FINAL CIRCULAR DEPENDENCY FIX: Lazy loading all providers
+// Removed all static imports - providers loaded dynamically when needed
+// This breaks the circular dependency chain completely
+import { AIProviderName, GoogleAIModels, OpenAIModels } from "../core/types.js";
+import { logger } from "../utils/logger.js";
+/**
+ * Provider Registry - registers all providers with the factory
+ * This is where we migrate providers one by one to the new pattern
+ */
+export class ProviderRegistry {
+    static registered = false;
+    static options = {
+        enableManualMCP: false, // Default to disabled for safety
+    };
+    /**
+     * Register all providers with the factory
+     */
+    static async registerAllProviders() {
+        if (this.registered) {
+            return;
+        }
+        try {
+            // ✅ LAZY LOADING: Register providers with dynamic import factory functions
+            const { ProviderFactory } = await import("./provider-factory.js");
+            // Register Google AI Studio Provider (our validated baseline)
+            ProviderFactory.registerProvider(AIProviderName.GOOGLE_AI, async (modelName, providerName, sdk) => {
+                const { GoogleAIStudioProvider } = await import("../providers/google-ai-studio.js");
+                return new GoogleAIStudioProvider(modelName, sdk);
+            }, GoogleAIModels.GEMINI_2_5_FLASH, ["google-ai-studio", "google", "gemini", "google-ai"]);
+            // Register OpenAI provider
+            ProviderFactory.registerProvider(AIProviderName.OPENAI, async (modelName, providerName, sdk) => {
+                const { OpenAIProvider } = await import("../providers/openAI.js");
+                return new OpenAIProvider(modelName);
+            }, OpenAIModels.GPT_4O_MINI, ["gpt", "chatgpt"]);
+            // Register Anthropic provider
+            ProviderFactory.registerProvider(AIProviderName.ANTHROPIC, async (modelName, providerName, sdk) => {
+                const { AnthropicProvider } = await import("../providers/anthropic.js");
+                return new AnthropicProvider(modelName, sdk);
+            }, "claude-3-5-sonnet-20241022", ["claude", "anthropic"]);
+            // Register Amazon Bedrock provider
+            ProviderFactory.registerProvider(AIProviderName.BEDROCK, async (modelName) => {
+                const { AmazonBedrockProvider } = await import("../providers/amazon-bedrock.js");
+                return new AmazonBedrockProvider(modelName);
+            }, undefined, // Let provider read BEDROCK_MODEL from .env
+            ["bedrock", "aws"]);
+            // Register Azure OpenAI provider
+            ProviderFactory.registerProvider(AIProviderName.AZURE, async (modelName) => {
+                const { AzureOpenAIProvider } = await import("../providers/azure-openai.js");
+                return new AzureOpenAIProvider(modelName);
+            }, "gpt-4o-mini", ["azure", "azure-openai"]);
+            // Register Google Vertex AI provider
+            ProviderFactory.registerProvider(AIProviderName.VERTEX, async (modelName) => {
+                const { GoogleVertexProvider } = await import("../providers/google-vertex.js");
+                return new GoogleVertexProvider(modelName);
+            }, "gemini-2.5-pro", ["vertex", "google-vertex"]);
+            // Register Hugging Face provider (Unified Router implementation)
+            ProviderFactory.registerProvider(AIProviderName.HUGGINGFACE, async (modelName) => {
+                const { HuggingFaceProvider } = await import("../providers/huggingFace.js");
+                return new HuggingFaceProvider(modelName);
+            }, process.env.HUGGINGFACE_MODEL || "microsoft/DialoGPT-medium", ["huggingface", "hf"]);
+            // Register Mistral AI provider
+            ProviderFactory.registerProvider(AIProviderName.MISTRAL, async (modelName, providerName, sdk) => {
+                const { MistralProvider } = await import("../providers/mistral.js");
+                return new MistralProvider(modelName, sdk);
+            }, "mistral-large-latest", ["mistral"]);
+            // Register Ollama provider
+            ProviderFactory.registerProvider(AIProviderName.OLLAMA, async (modelName) => {
+                const { OllamaProvider } = await import("../providers/ollama.js");
+                return new OllamaProvider(modelName);
+            }, process.env.OLLAMA_MODEL || "llama3.1:8b", ["ollama", "local"]);
+            logger.debug("All providers registered successfully");
+            this.registered = true;
+        }
+        catch (error) {
+            logger.error("Failed to register providers:", error);
+            throw error;
+        }
+    }
+    /**
+     * Check if providers are registered
+     */
+    static isRegistered() {
+        return this.registered;
+    }
+    /**
+     * Clear registrations (for testing)
+     */
+    static clearRegistrations() {
+        ProviderFactory.clearRegistrations();
+        this.registered = false;
+    }
+    /**
+     * Set registry options (should be called before initialization)
+     */
+    static setOptions(options) {
+        this.options = { ...this.options, ...options };
+        logger.debug("Provider registry options updated:", this.options);
+    }
+    /**
+     * Get current registry options
+     */
+    static getOptions() {
+        return { ...this.options };
+    }
+}
+// Note: Providers are registered explicitly when needed to avoid circular dependencies

package/dist/lib/index.d.ts

@@ -12,12 +12,13 @@ export type { AIProvider, AIProviderName, ProviderConfig, StreamingOptions, Prov
 export type { GenerateOptions, GenerateResult, EnhancedProvider, } from "./types/generate-types.js";
 export { CompatibilityConversionFactory } from "./factories/compatibility-factory.js";
 export { ProviderGenerateFactory } from "./factories/provider-generate-factory.js";
+export type { SimpleTool, ToolContext } from "./sdk/tool-registration.js";
+export { createTool, createTypedTool, validateTool, } from "./sdk/tool-registration.js";
+export type { InMemoryMCPServerConfig, InMemoryToolInfo, InMemoryToolResult, } from "./types/mcp-types.js";
 export { BedrockModels, OpenAIModels, VertexModels, DEFAULT_PROVIDER_CONFIGS, } from "./core/types.js";
-export { GoogleVertexAI, AmazonBedrock, OpenAI, AnthropicProvider, AzureOpenAIProvider, } from "./providers/index.js";
-export type { ProviderName } from "./providers/index.js";
-export { PROVIDERS, AVAILABLE_PROVIDERS } from "./providers/index.js";
 export { getBestProvider, getAvailableProviders, isValidProvider, } from "./utils/providerUtils.js";
 export { NeuroLink } from "./neurolink.js";
+export type { ProviderStatus, MCPStatus, MCPServerInfo } from "./neurolink.js";
 export declare const VERSION = "1.0.0";
 /**
  * Quick start factory function

package/dist/lib/index.js

@@ -11,14 +11,12 @@ import { AIProviderFactory } from "./core/factory.js";
 export { AIProviderFactory };
 export { CompatibilityConversionFactory } from "./factories/compatibility-factory.js";
 export { ProviderGenerateFactory } from "./factories/provider-generate-factory.js";
+export { createTool, createTypedTool, validateTool, } from "./sdk/tool-registration.js";
 // Model enums
 export { BedrockModels, OpenAIModels, VertexModels, DEFAULT_PROVIDER_CONFIGS, } from "./core/types.js";
-// Provider exports
-export { GoogleVertexAI, AmazonBedrock, OpenAI, AnthropicProvider, AzureOpenAIProvider, } from "./providers/index.js";
-export { PROVIDERS, AVAILABLE_PROVIDERS } from "./providers/index.js";
 // Utility exports
 export { getBestProvider, getAvailableProviders, isValidProvider, } from "./utils/providerUtils.js";
-// Main NeuroLink wrapper class
+// Main NeuroLink wrapper class and diagnostic types
 export { NeuroLink } from "./neurolink.js";
 // Version
 export const VERSION = "1.0.0";

package/dist/lib/mcp/config.js

@@ -3,15 +3,36 @@
  * Central registry for all MCP servers following Lighthouse patterns
  * Handles built-in servers only - auto-discovery handled by unified registry
  */
-import { aiCoreServer } from "./servers/ai-providers/ai-core-server.js";
 import { utilityServer } from "./servers/utilities/utility-server.js";
 import { logger } from "../utils/logger.js";
+/**
+ * Lazy-loaded AI Core Server to avoid circular dependencies
+ */
+let aiCoreServerCache = null;
+async function getAICoreServer() {
+    if (!aiCoreServerCache) {
+        const { aiCoreServer } = await import("./servers/ai-providers/ai-core-server.js");
+        aiCoreServerCache = aiCoreServer;
+    }
+    return aiCoreServerCache;
+}
+/**
+ * Lazy-loaded Direct Tools Server to avoid circular dependencies
+ */
+let directToolsServerCache = null;
+async function getDirectToolsServer() {
+    if (!directToolsServerCache) {
+        const { directToolsServer } = await import("./servers/agent/direct-tools-server.js");
+        directToolsServerCache = directToolsServer;
+    }
+    return directToolsServerCache;
+}
 /**
  * Built-in MCP servers (kept for backward compatibility)
  * Add new servers here as they are created
  */
 export const allServers = [
-    aiCoreServer,
+    // aiCoreServer will be added dynamically in getServers()
     utilityServer,
     // Add more servers as they are created
 ];
@@ -25,8 +46,12 @@ export const mcpConfig = {
      */
     getServers: async () => {
         const activeServers = [];
+        // Get all servers including dynamically loaded ones
+        const aiCoreServer = await getAICoreServer();
+        const directToolsServer = await getDirectToolsServer();
+        const servers = [aiCoreServer, directToolsServer, ...allServers];
         // Include built-in servers with filtering
-        for (const server of allServers) {
+        for (const server of servers) {
             const implementedTools = {};
             let hasImplementedTools = false;
             for (const toolName in server.tools) {

package/dist/lib/mcp/function-calling.js

@@ -58,7 +58,7 @@ export async function getAvailableFunctionTools() {
     const toolMap = new Map();
     try {
         // Add overall timeout for the entire function
-        const overallTimeoutMs = 5000; // 5 seconds max for everything
+        const overallTimeoutMs = process.env.NODE_ENV === "test" ? 30000 : 15000; // 30s for tests, 15s for production
         let overallTimeoutId;
         const overallTimeoutPromise = new Promise((_, reject) => {
             overallTimeoutId = setTimeout(() => {

package/dist/lib/mcp/initialize-tools.d.ts

@@ -13,7 +13,7 @@ export declare const initializeMCPTools: (sessionId: string, client: NeuroLinkMC
  * Get all available tools across all servers
  * Useful for documentation and discovery
  */
-export declare function getAllAvailableTools(): Promise<Array<{
+export declare function getAllAvailableTools(inMemoryServers?: Map<string, any>): Promise<Array<{
     serverId: string;
     serverTitle: string;
     toolName: string;

package/dist/lib/mcp/initialize-tools.js

@@ -139,8 +139,52 @@ export const initializeMCPTools = async (sessionId, client, context) => {
  * Get all available tools across all servers
  * Useful for documentation and discovery
  */
-export async function getAllAvailableTools() {
+export async function getAllAvailableTools(inMemoryServers) {
     const tools = [];
+    // Add in-memory server tools first
+    if (inMemoryServers) {
+        for (const [serverId, serverConfig] of inMemoryServers) {
+            const server = serverConfig.server;
+            if (server && server.tools) {
+                // Handle both Map and object formats
+                const toolEntries = server.tools instanceof Map
+                    ? Array.from(server.tools.entries())
+                    : Object.entries(server.tools || {});
+                for (const [toolName, toolInfo] of toolEntries) {
+                    const prefix = `${serverId}_`;
+                    const finalToolName = toolName.length > 64 - prefix.length
+                        ? toolName.substring(0, 64 - prefix.length)
+                        : toolName;
+                    const namespacedName = sanitizeToolName(`${prefix}${finalToolName}`);
+                    // Handle different tool info structures
+                    let description = `Tool from ${serverId}`;
+                    let isImplemented = true;
+                    if (toolInfo) {
+                        // Check if it's a tool info object with description
+                        if (typeof toolInfo.description === "string") {
+                            description = toolInfo.description;
+                        }
+                        else if (typeof toolInfo === "function") {
+                            // It's a raw function, no description available
+                            description = `${toolName} from ${serverId}`;
+                        }
+                        // Check implementation status
+                        if (typeof toolInfo.isImplemented === "boolean") {
+                            isImplemented = toolInfo.isImplemented;
+                        }
+                    }
+                    tools.push({
+                        serverId,
+                        serverTitle: server.title || serverId,
+                        toolName,
+                        namespacedName,
+                        description,
+                        isImplemented,
+                    });
+                }
+            }
+        }
+    }
     const servers = await mcpConfig.getServers();
     servers.forEach((server) => {
         Object.entries(server.tools).forEach(([toolName, tool]) => {

package/dist/lib/mcp/initialize.js

@@ -5,6 +5,7 @@
  */
 import { toolRegistry, defaultToolRegistry, } from "./tool-registry.js";
 import { mcpLogger } from "./logging.js";
+import { ServiceRegistry } from "../core/service-registry.js";
 let isInitialized = false;
 /**
  * Initialize NeuroLink MCP system by registering built-in servers
@@ -15,19 +16,28 @@ export async function initializeNeuroLinkMCP(targetRegistry) {
     }
     mcpLogger.debug("Initializing built-in MCP servers...");
     try {
+        // First, register AIProviderFactory in ServiceRegistry to break circular dependencies
+        ServiceRegistry.register("AIProviderFactory", async () => {
+            const { AIProviderFactory } = await import("../core/factory.js");
+            return AIProviderFactory;
+        });
+        mcpLogger.debug("Registered AIProviderFactory in ServiceRegistry");
         // Import utility server dynamically to avoid circular dependencies
-        // Note: AI core server temporarily disabled due to circular dependency issues
         const { utilityServer } = await import("./servers/utilities/utility-server.js");
         // Register built-in NeuroLink servers with specified registry (or default)
         const registry = targetRegistry || toolRegistry;
         await registry.registerServer(utilityServer.id, utilityServer);
         mcpLogger.debug(`Registered neurolink-utility server with built-in tools in ${targetRegistry ? "target" : "default"} registry`);
-        // TODO: Re-enable AI core server once circular dependencies are resolved
-        // const { aiCoreServer } = await import('./servers/ai-providers/ai-core-server.js');
-        // await registry.registerServer(aiCoreServer.id, aiCoreServer);
-        // mcpLogger.debug('Registered neurolink-ai-core server with AI tools');
+        // Now safe to import and register AI core server
+        const { aiCoreServer } = await import("./servers/ai-providers/ai-core-server.js");
+        await registry.registerServer(aiCoreServer.id, aiCoreServer);
+        mcpLogger.debug("Registered neurolink-ai-core server with AI tools");
+        // Register direct tools server
+        const { directToolsServer } = await import("./servers/agent/direct-tools-server.js");
+        await registry.registerServer(directToolsServer.id, directToolsServer);
+        mcpLogger.debug("Registered neurolink-direct server with direct tools");
         const stats = await registry.getStats();
-        mcpLogger.info(`Initialization complete: ${stats.totalServers} server, ${stats.totalTools} tools available`);
+        mcpLogger.info(`Initialization complete: ${stats.totalServers} servers, ${stats.totalTools} tools available`);
         isInitialized = true;
     }
     catch (error) {

package/dist/lib/mcp/servers/agent/direct-tools-server.d.ts

@@ -0,0 +1,8 @@
+/**
+ * NeuroLink Direct Tools Server
+ * Wraps the agent direct tools as an MCP server for proper registration
+ */
+/**
+ * Direct Tools Server - Agent direct tools for immediate use
+ */
+export declare const directToolsServer: import("../../factory.js").NeuroLinkMCPServer;

package/dist/lib/mcp/servers/agent/direct-tools-server.js

@@ -0,0 +1,109 @@
+/**
+ * NeuroLink Direct Tools Server
+ * Wraps the agent direct tools as an MCP server for proper registration
+ */
+import { createMCPServer } from "../../factory.js";
+import { directAgentTools } from "../../../agent/direct-tools.js";
+import { logger } from "../../../utils/logger.js";
+/**
+ * Direct Tools Server - Agent direct tools for immediate use
+ */
+export const directToolsServer = createMCPServer({
+    id: "neurolink-direct",
+    title: "NeuroLink Direct Tools Server",
+    description: "Provides direct agent tools for immediate execution",
+    category: "integrations",
+    version: "1.0.0",
+});
+/**
+ * Wrap each direct tool and register it with the server
+ */
+Object.entries(directAgentTools).forEach(([toolName, toolDef]) => {
+    // The toolDef is a Vercel AI SDK Tool object
+    // Extract properties from the Tool object
+    const toolSpec = toolDef._spec || toolDef;
+    const description = toolSpec.description || `Direct tool: ${toolName}`;
+    const inputSchema = toolSpec.parameters;
+    const execute = toolSpec.execute;
+    directToolsServer.registerTool({
+        name: toolName,
+        description: description,
+        category: getToolCategory(toolName),
+        inputSchema: inputSchema,
+        isImplemented: true,
+        execute: async (params, context) => {
+            const startTime = Date.now();
+            try {
+                logger.debug(`[Direct Tools] Executing ${toolName} with params:`, params);
+                // Execute the direct tool
+                const result = await execute(params);
+                // Convert direct tool result to ToolResult format
+                if (result.success) {
+                    return {
+                        success: true,
+                        data: result,
+                        usage: {
+                            executionTime: Date.now() - startTime,
+                        },
+                        metadata: {
+                            toolName,
+                            serverId: "neurolink-direct",
+                            sessionId: context.sessionId,
+                        },
+                    };
+                }
+                else {
+                    return {
+                        success: false,
+                        data: null,
+                        error: result.error || "Unknown error",
+                        usage: {
+                            executionTime: Date.now() - startTime,
+                        },
+                        metadata: {
+                            toolName,
+                            serverId: "neurolink-direct",
+                            sessionId: context.sessionId,
+                        },
+                    };
+                }
+            }
+            catch (error) {
+                logger.error(`[Direct Tools] Error executing ${toolName}:`, error);
+                return {
+                    success: false,
+                    data: null,
+                    error: error instanceof Error ? error.message : String(error),
+                    usage: {
+                        executionTime: Date.now() - startTime,
+                    },
+                    metadata: {
+                        toolName,
+                        serverId: "neurolink-direct",
+                        sessionId: context.sessionId,
+                    },
+                };
+            }
+        },
+    });
+});
+/**
+ * Get tool category based on tool name
+ */
+function getToolCategory(toolName) {
+    switch (toolName) {
+        case "getCurrentTime":
+            return "time";
+        case "calculateMath":
+            return "math";
+        case "readFile":
+        case "writeFile":
+        case "listDirectory":
+        case "searchFiles":
+            return "filesystem";
+        default:
+            return "utility";
+    }
+}
+// Log successful registration
+logger.info(`[Direct Tools] Registered ${Object.keys(directAgentTools).length} direct tools`);

package/dist/lib/mcp/servers/ai-providers/ai-core-server.js

@@ -5,7 +5,7 @@
  */
 import { z } from "zod";
 import { createMCPServer } from "../../factory.js";
-import { AIProviderFactory } from "../../../core/factory.js";
+import { ServiceRegistry } from "../../../core/service-registry.js";
 import { getBestProvider, getAvailableProviders, } from "../../../utils/providerUtils.js";
 import { logger } from "../../../utils/logger.js";
 import { analyzeAIUsageTool, benchmarkProviderPerformanceTool, optimizePromptParametersTool, } from "./ai-analysis-tools.js";
@@ -86,6 +86,8 @@ aiCoreServer.registerTool({
             logger.debug(`[AI-Core] Starting text generation: "${params.prompt.substring(0, 50)}..."`);
             // Use existing AIProviderFactory with best provider selection
             const selectedProvider = params.provider || (await getBestProvider(params.provider));
+            // Get AIProviderFactory from ServiceRegistry to avoid circular dependency
+            const AIProviderFactory = await ServiceRegistry.get("AIProviderFactory");
             const provider = await AIProviderFactory.createBestProvider(selectedProvider);
             // Generate text using existing NeuroLink patterns
             const result = await provider.generate({

package/dist/lib/mcp/servers/ai-providers/ai-workflow-tools.d.ts

@@ -88,14 +88,14 @@ export declare const workflowToolSchemas: {
     }, "strip", z.ZodTypeAny, {
         aiOutput: string;
         expectedBehavior: string;
-        outputType: "text" | "code" | "conversation" | "structured-data";
+        outputType: "text" | "code" | "structured-data" | "conversation";
         includeFixSuggestions: boolean;
         context?: string | undefined;
     }, {
         aiOutput: string;
         expectedBehavior: string;
         context?: string | undefined;
-        outputType?: "text" | "code" | "conversation" | "structured-data" | undefined;
+        outputType?: "text" | "code" | "structured-data" | "conversation" | undefined;
         includeFixSuggestions?: boolean | undefined;
     }>;
 };

package/dist/lib/mcp/unified-registry.d.ts

@@ -26,6 +26,10 @@ export declare class UnifiedMCPRegistry extends MCPToolRegistry {
      * Load servers from .mcp-config.json
      */
     private loadManualConfig;
+    /**
+     * Connect to manually configured servers
+     */
+    private connectManualServers;
     /**
      * Enable or disable auto-discovery
      */

package/dist/lib/mcp/unified-registry.js

@@ -3,7 +3,7 @@
  */
 import { autoRegisterMCPServers, } from "./auto-discovery.js";
 import { unifiedRegistryLogger } from "./logging.js";
-import { MCPToolRegistry, } from "./tool-registry.js";
+import { MCPToolRegistry, defaultToolRegistry, } from "./tool-registry.js";
 import { TransportManager, TransportConfigSchema, } from "./transport-manager.js";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { ErrorManager } from "./error-manager.js";
@@ -30,8 +30,18 @@ export class UnifiedMCPRegistry extends MCPToolRegistry {
      */
     async initialize(options = {}) {
         unifiedRegistryLogger.info("Initializing unified MCP registry...");
-        // Load manual configuration first
-        await this.loadManualConfig();
+        // Import ProviderRegistry to check options
+        const { ProviderRegistry } = await import("../factories/provider-registry.js");
+        const registryOptions = ProviderRegistry.getOptions();
+        // Only load manual config if explicitly enabled (CLI mode)
+        if (registryOptions.enableManualMCP) {
+            unifiedRegistryLogger.info("Manual MCP config enabled - loading .mcp-config.json");
+            await this.loadManualConfig();
+            await this.connectManualServers();
+        }
+        else {
+            unifiedRegistryLogger.debug("Manual MCP config disabled - skipping .mcp-config.json");
+        }
         if (this.autoDiscoveryEnabled) {
             const result = await autoRegisterMCPServers(options);
             unifiedRegistryLogger.info(`Auto-discovery complete: ${result.registered} registered, ${result.failed} failed`);
@@ -95,6 +105,29 @@ export class UnifiedMCPRegistry extends MCPToolRegistry {
             unifiedRegistryLogger.error("Failed to load manual config:", error instanceof Error ? error.message : String(error));
         }
     }
+    /**
+     * Connect to manually configured servers
+     */
+    async connectManualServers() {
+        for (const [serverId, serverConfig] of this.manualServers.entries()) {
+            try {
+                unifiedRegistryLogger.info(`Connecting to manual server: ${serverId}`);
+                // Use addExternalServer method which properly establishes connections
+                await this.addExternalServer(serverId, {
+                    type: "stdio",
+                    command: serverConfig.command || "npx",
+                    args: serverConfig.args || [],
+                    env: serverConfig.env,
+                });
+                unifiedRegistryLogger.info(`Successfully connected manual server: ${serverId}`);
+            }
+            catch (error) {
+                unifiedRegistryLogger.error(`Failed to connect manual server ${serverId}:`, error instanceof Error ? error.message : String(error));
+                // Remove from available servers if connection fails
+                this.availableServers.delete(serverId);
+            }
+        }
+    }
     /**
      * Enable or disable auto-discovery
      */
@@ -141,8 +174,8 @@ export class UnifiedMCPRegistry extends MCPToolRegistry {
     async listAllTools() {
         const allTools = [];
         try {
-            // FIXED: Get built-in tools from base registry
-            const builtInTools = await super.listTools();
+            // FIXED: Get built-in tools from defaultToolRegistry where they are actually registered
+            const builtInTools = await defaultToolRegistry.listTools();
             allTools.push(...builtInTools.map((tool) => ({
                 ...tool,
                 id: tool.name,
@@ -150,7 +183,7 @@ export class UnifiedMCPRegistry extends MCPToolRegistry {
                 source: "built-in",
                 isExternal: false,
             })));
-            unifiedRegistryLogger.debug(`Found ${builtInTools.length} built-in tools`);
+            unifiedRegistryLogger.debug(`Found ${builtInTools.length} built-in tools from defaultToolRegistry`);
         }
         catch (error) {
             unifiedRegistryLogger.warn("Failed to get built-in tools:", error);
@@ -194,10 +227,10 @@ export class UnifiedMCPRegistry extends MCPToolRegistry {
      */
     async executeTool(toolName, args, context) {
         unifiedRegistryLogger.info(`Executing tool: ${toolName}`);
-        // STEP 1: Try built-in tools first
+        // STEP 1: Try built-in tools first from defaultToolRegistry
         try {
-            const result = await super.executeTool(toolName, args, context);
-            unifiedRegistryLogger.info(`Tool ${toolName} executed successfully via built-in registry`);
+            const result = await defaultToolRegistry.executeTool(toolName, args, context);
+            unifiedRegistryLogger.info(`Tool ${toolName} executed successfully via defaultToolRegistry`);
             return result;
         }
         catch (builtInError) {