@juspay/neurolink 5.0.0 → 5.2.0

package/dist/cli/index.js

@@ -21,7 +21,7 @@ import chalk from "chalk";
 import fs from "fs";
 import { addMCPCommands } from "./commands/mcp.js";
 import { addOllamaCommands } from "./commands/ollama.js";
-import { AgentEnhancedProvider } from "../lib/providers/agent-enhanced-provider.js";
+import { CLICommandFactory } from "./factories/command-factory.js";
 import { logger } from "../lib/utils/logger.js";
 /**
  * Helper functions for displaying analytics and evaluation results
@@ -192,6 +192,19 @@ function handleError(error, context) {
     }
     process.exit(1);
 }
+// Initialize MCP system for CLI with manual config enabled
+async function initializeCLI() {
+    // Import and configure for CLI mode
+    const { ProviderRegistry } = await import("../lib/factories/provider-registry.js");
+    const { initializeNeuroLinkMCP } = await import("../lib/mcp/initialize.js");
+    // Enable manual MCP only for CLI
+    ProviderRegistry.setOptions({
+        enableManualMCP: true,
+    });
+    // Initialize MCP system
+    await initializeNeuroLinkMCP();
+    logger.debug("CLI initialized with manual MCP support enabled");
+}
 // Initialize SDK
 const sdk = new NeuroLink();
 // Manual pre-validation for unknown flags
@@ -289,9 +302,9 @@ const cli = yargs(args)
     }
     exitProcess(); // Default exit
 })
-    // Generate Text Command
-    .command(["generate-text [prompt]", "generate [prompt]", "gen [prompt]"], "Generate text using AI providers", (yargsInstance) => yargsInstance
-    .usage("Usage: $0 generate-text [prompt] [options]")
+    // Generate Command (Primary)
+    .command(["generate [prompt]", "gen [prompt]"], "Generate content using AI providers", (yargsInstance) => yargsInstance
+    .usage("Usage: $0 generate [prompt] [options]")
     .positional("prompt", {
     type: "string",
     description: "Text prompt for AI generation (or read from stdin)",
@@ -302,6 +315,7 @@ const cli = yargs(args)
         "openai",
         "bedrock",
         "vertex",
+        "google-vertex",
         "anthropic",
         "azure",
         "google-ai",
@@ -378,10 +392,10 @@ const cli = yargs(args)
     type: "string",
     description: "JSON context object for custom data",
 })
-    .example('$0 generate-text "Hello world"', "Basic text generation")
-    .example('$0 generate-text "Write a story" --provider openai', "Use specific provider")
-    .example('$0 generate-text "What time is it?"', "Use with natural tool integration (default)")
-    .example('$0 generate-text "Hello world" --disable-tools', "Use without tool integration"), async (argv) => {
+    .example('$0 generate "Hello world"', "Basic content generation")
+    .example('$0 generate "Write a story" --provider openai', "Use specific provider")
+    .example('$0 generate "What time is it?"', "Use with natural tool integration (default)")
+    .example('$0 generate "Hello world" --disable-tools', "Use without tool integration"), async (argv) => {
     // SOLUTION 1: Handle stdin input if no prompt provided
     if (!argv.prompt && !process.stdin.isTTY) {
         // Read from stdin
@@ -429,13 +443,10 @@ const cli = yargs(args)
     if (errors.length > 0) {
         throw new Error(`Parameter validation failed:\n${errors.map((e) => `  • ${e}`).join("\n")}\n\nUse --help for valid parameter ranges.`);
     }
-    // Check if generate-text was used specifically (for deprecation warning)
-    const usedCommand = argv._[0];
-    if (usedCommand === "generate-text" && !argv.quiet) {
-        console.warn(chalk.yellow('⚠️  Warning: "generate-text" is deprecated. Use "generate" or "gen" instead for multimodal support.'));
-    }
+    // Command is now the primary generate method
     let originalConsole = {};
-    if (argv.format === "json" && !argv.quiet) {
+    if ((argv.format === "json" || argv.outputFormat === "json") &&
+        !argv.quiet) {
         // Suppress only if not quiet, as quiet implies no spinners anyway
         originalConsole = { ...console };
         Object.keys(originalConsole).forEach((key) => {
@@ -444,7 +455,7 @@ const cli = yargs(args)
             }
         });
     }
-    const spinner = argv.format === "json" || argv.quiet
+    const spinner = argv.outputFormat === "json" || argv.format === "json" || argv.quiet
         ? null
         : ora("🤖 Generating text...").start();
     try {
@@ -455,8 +466,6 @@ const cli = yargs(args)
                 reject(new Error(`CLI operation timed out after ${cliTimeout / 1000} seconds. Use --timeout to adjust.`));
             }, cliTimeout);
         });
-        // Use AgentEnhancedProvider when tools are enabled, otherwise use standard SDK
-        let generatePromise;
         // Parse context if provided
         let contextObj;
         if (argv.context) {
@@ -467,60 +476,26 @@ const cli = yargs(args)
                 throw new Error("Invalid JSON provided for --context option");
             }
         }
-        if (argv.disableTools === true) {
-            // Tools disabled - use standard SDK
-            generatePromise = sdk.generateText({
-                prompt: argv.prompt,
-                provider: argv.provider === "auto"
-                    ? undefined
-                    : argv.provider,
-                model: argv.model,
-                temperature: argv.temperature,
-                maxTokens: argv.maxTokens,
-                systemPrompt: argv.system,
-                timeout: argv.timeout,
-                // NEW: Analytics and evaluation support
-                enableAnalytics: argv.enableAnalytics,
-                enableEvaluation: argv.enableEvaluation,
-                context: contextObj,
-                // NEW: Lighthouse-compatible domain-aware evaluation
-                evaluationDomain: argv.evaluationDomain,
-                toolUsageContext: argv.toolUsageContext,
-            });
-        }
-        else {
-            // Tools enabled - use AgentEnhancedProvider for tool calling capabilities
-            // Map provider to supported AgentEnhancedProvider types
-            const supportedProvider = (() => {
-                switch (argv.provider) {
-                    case "openai":
-                    case "anthropic":
-                    case "google-ai":
-                        return argv.provider;
-                    case "auto":
-                    default:
-                        return "google-ai"; // Default to google-ai for best tool support
-                }
-            })();
-            const agentProvider = new AgentEnhancedProvider({
-                provider: supportedProvider,
-                model: argv.model, // Use specified model or default
-                toolCategory: "all", // Enable all tool categories
-            });
-            generatePromise = agentProvider.generateText({
-                prompt: argv.prompt,
-                temperature: argv.temperature,
-                maxTokens: argv.maxTokens, // Respect user's token limit - no artificial caps
-                systemPrompt: argv.system,
-                // NEW: Analytics and evaluation support
-                enableAnalytics: argv.enableAnalytics,
-                enableEvaluation: argv.enableEvaluation,
-                context: contextObj,
-                // NEW: Lighthouse-compatible domain-aware evaluation
-                evaluationDomain: argv.evaluationDomain,
-                toolUsageContext: argv.toolUsageContext,
-            });
-        }
+        // Use standard SDK for all generation - tools are now built into BaseProvider
+        const generatePromise = sdk.generate({
+            input: { text: argv.prompt },
+            provider: argv.provider === "auto"
+                ? undefined
+                : argv.provider,
+            model: argv.model,
+            temperature: argv.temperature,
+            maxTokens: argv.maxTokens,
+            systemPrompt: argv.system,
+            timeout: argv.timeout,
+            disableTools: argv.disableTools === true, // Tools are enabled by default
+            // NEW: Analytics and evaluation support
+            enableAnalytics: argv.enableAnalytics,
+            enableEvaluation: argv.enableEvaluation,
+            context: contextObj,
+            // NEW: Lighthouse-compatible domain-aware evaluation
+            evaluationDomain: argv.evaluationDomain,
+            toolUsageContext: argv.toolUsageContext,
+        });
         // Wrap generation with master timeout to prevent infinite hangs
         const result = await Promise.race([generatePromise, timeoutPromise]);
         if (argv.format === "json" && originalConsole.log) {
@@ -536,7 +511,8 @@ const cli = yargs(args)
             completionTokens: 0,
             totalTokens: 0,
         };
-        if (argv.format === "json") {
+        if (argv.format === "json" || argv.outputFormat === "json") {
+            // CLI debug removed - analytics and evaluation now working correctly
             const jsonOutput = {
                 content: responseText,
                 provider: typedResult?.provider || argv.provider,
@@ -636,7 +612,7 @@ const cli = yargs(args)
     }
 })
     // Stream Text Command
-    .command("stream [prompt]", "Stream text generation in real-time", (yargsInstance) => yargsInstance
+    .command("stream [prompt]", "Stream generation in real-time", (yargsInstance) => yargsInstance
     .usage("Usage: $0 stream [prompt] [options]")
     .positional("prompt", {
     type: "string",
@@ -648,6 +624,7 @@ const cli = yargs(args)
         "openai",
         "bedrock",
         "vertex",
+        "google-vertex",
         "anthropic",
         "azure",
         "google-ai",
@@ -662,6 +639,10 @@ const cli = yargs(args)
     type: "number",
     default: 0.7,
     description: "Creativity level",
+})
+    .option("max-tokens", {
+    type: "number",
+    description: "Maximum number of tokens to generate",
 })
     .option("timeout", {
     type: "string",
@@ -747,76 +728,31 @@ const cli = yargs(args)
                 throw new Error("Invalid JSON provided for --context option");
             }
         }
-        let stream;
-        if (argv.disableTools === true) {
-            // Tools disabled - use standard SDK
-            stream = await sdk.generateTextStream({
-                prompt: argv.prompt,
-                provider: argv.provider === "auto"
-                    ? undefined
-                    : argv.provider,
-                model: argv.model,
-                temperature: argv.temperature,
-                timeout: argv.timeout,
-                // NEW: Analytics and evaluation support
-                enableAnalytics: argv.enableAnalytics,
-                enableEvaluation: argv.enableEvaluation,
-                context: contextObj,
-            });
-        }
-        else {
-            // Tools enabled - use AgentEnhancedProvider for streaming tool calls
-            // Map provider to supported AgentEnhancedProvider types
-            const supportedProvider = (() => {
-                switch (argv.provider) {
-                    case "openai":
-                    case "anthropic":
-                    case "google-ai":
-                        return argv.provider;
-                    case "auto":
-                    default:
-                        return "google-ai"; // Default to google-ai for best tool support
-                }
-            })();
-            const agentProvider = new AgentEnhancedProvider({
-                provider: supportedProvider,
-                model: argv.model, // Use specified model or default
-                toolCategory: "all", // Enable all tool categories
-            });
-            // Note: AgentEnhancedProvider doesn't support streaming with tools yet
-            // Fall back to generateText for now
-            const result = await agentProvider.generateText({
-                prompt: argv.prompt,
-                temperature: argv.temperature,
-                // NEW: Analytics and evaluation support
-                enableAnalytics: argv.enableAnalytics,
-                enableEvaluation: argv.enableEvaluation,
-                context: contextObj,
-            });
-            // Simulate streaming by outputting the result
-            const text = result?.text || "";
-            const CHUNK_SIZE = 10;
-            const DELAY_MS = 50;
-            for (let i = 0; i < text.length; i += CHUNK_SIZE) {
-                process.stdout.write(text.slice(i, i + CHUNK_SIZE));
-                await new Promise((resolve) => setTimeout(resolve, DELAY_MS)); // Small delay
-            }
-            if (!argv.quiet) {
-                process.stdout.write("\n");
-            }
-            // Show analytics if enabled
-            // Show analytics and evaluation if enabled
-            displayAnalyticsAndEvaluation(result, argv);
-            return; // Exit early for agent mode
-        }
-        for await (const chunk of stream) {
+        // Use standard SDK streaming - tools are handled automatically
+        const sdk = new NeuroLink();
+        const stream = await sdk.stream({
+            input: { text: argv.prompt },
+            provider: argv.provider === "auto"
+                ? undefined
+                : argv.provider,
+            model: argv.model,
+            temperature: argv.temperature,
+            timeout: argv.timeout,
+            disableTools: argv.disableTools === true, // Tools are enabled by default
+            // NEW: Analytics and evaluation support
+            enableAnalytics: argv.enableAnalytics,
+            enableEvaluation: argv.enableEvaluation,
+            context: contextObj,
+        });
+        // Process the stream
+        for await (const chunk of stream.stream) {
             process.stdout.write(chunk.content);
-            // In debug mode, interleaved logging would appear here
-            // (SDK logs are controlled by NEUROLINK_DEBUG set in middleware)
         }
         if (!argv.quiet) {
             process.stdout.write("\n");
-        } // Ensure newline after stream
+        }
+        // Clean exit for tools-disabled streaming
+        process.exit(0);
     }
     catch (error) {
         handleError(error, "Text streaming");
@@ -845,6 +781,7 @@ const cli = yargs(args)
         "openai",
         "bedrock",
         "vertex",
+        "google-vertex",
         "anthropic",
         "azure",
         "google-ai",
@@ -911,8 +848,8 @@ const cli = yargs(args)
                 spinner.text = `Processing ${i + 1}/${prompts.length}: ${prompts[i].substring(0, 30)}...`;
             }
             try {
-                const result = await sdk.generateText({
-                    prompt: prompts[i],
+                const result = await sdk.generate({
+                    input: { text: prompts[i] },
                     provider: argv.provider === "auto"
                         ? undefined
                         : argv.provider,
@@ -984,6 +921,7 @@ const cli = yargs(args)
             "openai",
             "bedrock",
             "vertex",
+            "google-vertex",
             "anthropic",
             "azure",
             "google-ai",
@@ -1074,8 +1012,8 @@ const cli = yargs(args)
             try {
                 const start = Date.now();
                 // Add timeout to prevent hanging
-                const testPromise = sdk.generateText({
-                    prompt: "test",
+                const testPromise = sdk.generate({
+                    input: { text: "test" },
                     provider: p,
                     maxTokens: 1,
                     disableTools: true, // Disable tools for faster status check
@@ -1135,19 +1073,24 @@ const cli = yargs(args)
         .example("$0 provider status", "Check all providers");
 })
     // Status command alias
-    .command("status", "Check AI provider connectivity and performance (alias for provider status)", (yargsConfig) => yargsConfig.example("$0 status", "Quick provider status check"), async (argv) => {
-    // Simply redirect to provider status
-    process.argv = [
-        process.argv[0],
-        process.argv[1],
-        "provider",
-        "status",
-        ...process.argv.slice(3),
-    ];
-    const { hideBin } = await import("yargs/helpers");
-    const redirectedCli = yargs(hideBin(process.argv));
-    // Re-run with provider status
-    await cli.parse("provider status");
+    .command("status", "Check AI provider connectivity and performance (alias for provider status)", (yargsConfig) => yargsConfig
+    .usage("Usage: $0 status [options]")
+    .option("verbose", {
+    type: "boolean",
+    alias: "v",
+    description: "Show detailed information",
+})
+    .option("quiet", {
+    type: "boolean",
+    alias: "q",
+    description: "Suppress non-essential output",
+})
+    .example("$0 status", "Quick provider status check")
+    .example("$0 status --verbose", "Show detailed status information"), async (argv) => {
+    // Direct implementation instead of redirect to avoid recursion
+    const { CLICommandFactory } = await import("./factories/command-factory.js");
+    const commandFactory = new CLICommandFactory();
+    await commandFactory.executeProviderStatus(argv);
 })
     // Configuration Command Group
     .command("config <subcommand>", "Manage NeuroLink configuration", (yargsConfig) => {
@@ -1213,7 +1156,7 @@ const cli = yargs(args)
     .example("$0 get-best-provider --format json", "Show in JSON format"), async (argv) => {
     try {
         const { getBestProvider } = await import("../lib/utils/providerUtils-fixed.js");
-        const bestProvider = getBestProvider();
+        const bestProvider = await getBestProvider();
         if (argv.format === "json") {
             process.stdout.write(JSON.stringify({ provider: bestProvider }, null, 2) + "\n");
         }
@@ -1237,6 +1180,8 @@ const cli = yargs(args)
     .example("$0 completion >> ~/.zshrc", "Add to zsh"), async (argv) => {
     cli.showCompletionScript();
 });
+// Add NEW Generate Command (Primary)
+cli.command(CLICommandFactory.createGenerateCommand());
 // Add MCP Commands
 addMCPCommands(cli);
 // Add Ollama Commands
@@ -1244,6 +1189,9 @@ addOllamaCommands(cli);
 // Execute CLI
 (async () => {
     try {
+        // Initialize CLI with manual MCP support
+        await initializeCLI();
+        // Parse and execute commands
         await cli.parse();
     }
     catch (error) {

package/dist/cli/utils/interactive-setup.js

@@ -244,7 +244,7 @@ export async function testProviderConnectivity(providers, quiet = false) {
         }
         try {
             const start = Date.now();
-            await sdk.generateText({ prompt: "test", provider, maxTokens: 1 });
+            await sdk.generate({ input: { text: "test" }, provider, maxTokens: 1 });
             const duration = Date.now() - start;
             results.push({ provider, status: "working", responseTime: duration });
             if (spinner) {
@@ -291,7 +291,7 @@ export function displaySetupSummary(result, quiet = false) {
     if (working > 0) {
         console.log(chalk.green("\n✅ Setup completed successfully!"));
         console.log(chalk.yellow("💡 You can now use NeuroLink with your configured providers."));
-        console.log(chalk.gray('   Try: neurolink generate-text "Hello, AI!"'));
+        console.log(chalk.gray('   Try: neurolink generate "Hello, AI!"'));
     }
     else {
         console.log(chalk.red("\n❌ No providers are working."));