@majkapp/majk-chat-cli 1.0.15 → 1.0.20

package/dist/cli.js

@@ -49,8 +49,6 @@ const interactive_1 = require("./interactive/interactive");
 const credentials_1 = require("./utils/credentials");
 const profile_config_1 = require("./utils/profile-config");
 const config_1 = require("./utils/config");
-const bash_tool_1 = require("./tools/bash.tool");
-const filesystem_tool_1 = require("./tools/filesystem.tool");
 const majk_chat_mcp_1 = require("@majkapp/majk-chat-mcp");
 const majk_chat_basic_tools_1 = require("@majkapp/majk-chat-basic-tools");
 const majk_chat_document_tools_1 = require("@majkapp/majk-chat-document-tools");
@@ -58,13 +56,14 @@ const majk_chat_sessions_1 = require("@majkapp/majk-chat-sessions");
 const models_1 = require("./utils/models");
 const tool_filter_1 = require("./utils/tool-filter");
 const output_1 = require("./utils/output");
+const executors_1 = require("./executors");
 // Load environment variables
 dotenv_1.default.config();
 const program = new commander_1.Command();
 program
     .name('majk-chat')
     .description('CLI for multi-provider LLM chat interactions')
-    .version('1.0.15');
+    .version('1.0.20');
 // Add credential options helper function
 function addCredentialOptions(command) {
     return command
@@ -92,13 +91,15 @@ function addCredentialOptions(command) {
 }
 // Chat command
 const chatCommand = program
-    .command('chat')
+    .command('chat [message...]')
     .description('Send a chat message to an LLM provider')
+    .option('--agent <type>', 'Executor to use: "majk" (default) or "claude-code". Can also be set via MAJK_AGENT environment variable')
     .option('--provider <provider>', 'Provider to use (openai, anthropic, azure-openai, bedrock)')
     .option('--model <model>', 'Model or alias (e.g., "sonnet", "opus", "claude-3-5-sonnet-20241022")')
     .option('-M, --message <message>', 'Message to send')
     .option('-p <value>', 'JSON messages array or prompt string')
     .option('-f, --file <file>', 'Read message from file')
+    .option('--image <paths...>', 'One or more image file paths to include with the message (PNG, JPEG, GIF, WebP)')
     .option('--prompts <file>', 'File with one prompt per line (sequential execution)')
     .option('-s, --system <system>', 'System message')
     .option('-S, --system-file <file>', 'Read system message from file')
@@ -107,7 +108,7 @@ const chatCommand = program
     .option('--max-tokens <tokens>', 'Maximum tokens', parseInt)
     .option('-j, --json', 'Output JSON response')
     .option('--output-format <format>', 'Output format: "text" (default) or "stream-json"', 'text')
-    .option('--tools', 'Enable tool execution')
+    .option('--tools', 'Enable core tools (bash, read, write, etc.) - equivalent to --enable-core-tools')
     .option('--enable-core-tools', 'Enable majk-chat-basic-tools (bash, ls, read, etc.)')
     .option('--enable-read-only-tools', 'Enable read-only majk-chat-basic-tools (ls, read, grep, web_fetch, etc.)')
     .option('--disable-tools', 'Disable all tools including read-only tools (overrides defaults)')
@@ -129,13 +130,23 @@ const chatCommand = program
     .option('--list-sessions', 'List all sessions for current directory')
     .option('--delete-session <uuid>', 'Delete a specific session by UUID')
     .option('--dry-run', 'Enable dry run mode - plan operations without executing them')
-    .option('--dry-run-review', 'Enable dry run mode with interactive review and execution of planned operations');
+    .option('--dry-run-review', 'Enable dry run mode with interactive review and execution of planned operations')
+    .option('--save-prompts <file>', 'Save all prompts to JSONL file for analysis and debugging');
 addCredentialOptions(chatCommand)
-    .action(async (options) => {
+    .action(async (messageArgs, options) => {
     let cleanup = null;
     // Initialize output handler early so we can pass callbacks
     const outputHandler = new output_1.OutputHandler(options.outputFormat);
+    // Handle positional message arguments
+    if (messageArgs && messageArgs.length > 0 && !options.message && !options.file && !options.p) {
+        options.message = messageArgs.join(' ');
+    }
     try {
+        const agentType = options.agent || process.env.MAJK_AGENT || 'majk';
+        if (agentType === 'claude-code' || agentType === 'claude') {
+            await handleClaudeCodeExecutor(options, outputHandler);
+            return;
+        }
         const setupOptions = {
             ...options,
             outputFormat: options.outputFormat, // Pass output format to suppress logs
@@ -254,11 +265,11 @@ addCredentialOptions(chatCommand)
             messages: allMessages,
             temperature: options.temperature,
             max_tokens: options.maxTokens,
-            // Always include tools if any are registered (from MCP or --tools flag)
+            // Always include tools if any are registered (from MCP or basic tools)
             tools: tools.length > 0 ? tools : undefined,
             // Enable auto-execution if tools are enabled (default unless --disable-tools) or MCP configured
             max_steps: (options.tools || !options.disableTools || options.mcpConfig || options.mcpServers)
-                ? (options.maxSteps || 5)
+                ? (options.maxSteps || (!options.disableTools && !options.tools && !options.mcpConfig && !options.mcpServers ? 500 : 5))
                 : 0,
             // Request transcript when saving sessions to capture complete tool execution history
             return_transcript: usesSessions
@@ -351,7 +362,7 @@ const interactiveCommand = program
     .option('-m, --model <model>', 'Model to use')
     .option('-s, --system <system>', 'System message')
     .option('-S, --system-file <file>', 'Read system message from file')
-    .option('--tools', 'Enable tool execution')
+    .option('--tools', 'Enable core tools (bash, read, write, etc.) - equivalent to --enable-core-tools')
     .option('--enable-core-tools', 'Enable majk-chat-basic-tools (bash, ls, read, etc.)')
     .option('--enable-read-only-tools', 'Enable read-only majk-chat-basic-tools (ls, read, grep, web_fetch, etc.)')
     .option('--disable-tools', 'Disable all tools including read-only tools (overrides defaults)')
@@ -374,7 +385,7 @@ addCredentialOptions(interactiveCommand)
         const { chat, toolRegistry } = setupResult;
         cleanup = setupResult.cleanup;
         const systemMessage = await getSystemMessage(options);
-        // Check if we have tools available from MCP or --tools flag
+        // Check if we have tools available from MCP or basic tools
         const hasTools = toolRegistry.getDefinitions().length > 0;
         const interactive = new interactive_1.InteractiveMode(chat, {
             provider: options.provider,
@@ -698,6 +709,74 @@ program
     }
 });
 // Helper functions
+async function handleClaudeCodeExecutor(options, outputHandler) {
+    try {
+        await executors_1.ExecutorFactory.validateExecutorChoice('claude-code');
+        const messages = await buildMessages(options);
+        if (!messages || messages.length === 0) {
+            outputHandler.outputError('No message provided');
+            process.exit(1);
+        }
+        const credOptions = extractCredentialOptions(options);
+        const executorOptions = {
+            provider: options.provider,
+            model: options.model,
+            messages,
+            temperature: options.temperature,
+            maxTokens: options.maxTokens,
+            maxSteps: options.maxSteps,
+            systemPrompt: options.system || options.appendSystemPrompt,
+            outputFormat: options.outputFormat || 'text',
+            tools: options.tools,
+            enableCoreTools: options.enableCoreTools || options.tools,
+            enableReadOnlyTools: options.enableReadOnlyTools,
+            disableTools: options.disableTools,
+            planningMode: options.planningMode,
+            mcpConfig: options.mcpConfig,
+            mcpServers: options.mcpServers,
+            allowedTools: options.allowedTools,
+            disallowedTools: options.disallowedTools,
+            permissionPromptTool: options.permissionPromptTool,
+            bedrockApiKey: credOptions.bedrockApiKey,
+            awsAccessKeyId: credOptions.awsAccessKeyId,
+            awsSecretAccessKey: credOptions.awsSecretAccessKey,
+            awsSessionToken: credOptions.awsSessionToken,
+            awsRegion: credOptions.awsRegion,
+            anthropicApiKey: credOptions.anthropicApiKey,
+            openaiApiKey: credOptions.openaiApiKey,
+            cwd: process.cwd(),
+            onToolCall: options.outputFormat === 'stream-json'
+                ? (toolCall) => outputHandler.outputToolCallMessage(toolCall)
+                : undefined,
+            onToolResult: options.outputFormat === 'stream-json'
+                ? (toolCall, result) => outputHandler.outputToolResult(toolCall.id, result)
+                : undefined
+        };
+        const executor = executors_1.ExecutorFactory.create('claude-code');
+        const spinner = outputHandler.startSpinner('Sending message...');
+        const apiStart = Date.now();
+        const result = await executor.execute(executorOptions);
+        const apiDuration = Date.now() - apiStart;
+        if (spinner)
+            spinner.succeed('Response received');
+        if (options.json) {
+            console.log(JSON.stringify(result.response, null, 2));
+        }
+        else {
+            const assistantMessage = result.response.choices[0].message;
+            const content = typeof assistantMessage.content === 'string'
+                ? assistantMessage.content
+                : JSON.stringify(assistantMessage.content);
+            outputHandler.outputMessage('assistant', content, result.response.usage, assistantMessage.tool_calls);
+            outputHandler.outputComplete(result.response.usage, apiDuration);
+        }
+        process.exit(0);
+    }
+    catch (error) {
+        outputHandler.outputError(error instanceof Error ? error.message : String(error));
+        process.exit(1);
+    }
+}
 // Extract credential options from CLI arguments
 function extractCredentialOptions(options) {
     return {
@@ -790,38 +869,16 @@ async function setupChat(options) {
     if (!hasValidCredentials) {
         throw new Error('No valid API credentials found. Please provide API keys via command line options, environment variables, or .env files. Use --help to see available credential options.');
     }
-    // Add tools if enabled
-    if (options.tools) {
-        builder
-            .withTool(new bash_tool_1.BashTool())
-            .withTool(new filesystem_tool_1.FileSystemTool())
-            .withAutoToolExecution(options.maxSteps || 5);
-        // Override default context management if user specified custom tool result limit
-        if (options.toolResultLimit && !isNaN(options.toolResultLimit) && options.toolResultLimit > 0) {
-            builder.withContextManagement({
-                enableTruncation: true,
-                maxLength: options.toolResultLimit,
-                conversationId: options.requestId || 'cli-session'
-            });
-        }
-    }
     // Add tools - now enabled by default unless explicitly disabled
     const shouldEnableTools = !options.disableTools; // Default to true unless --disable-tools is used
     const enableReadOnlyTools = shouldEnableTools && (options.enableReadOnlyTools !== false); // Default to true
-    const enableCoreTools = options.enableCoreTools;
+    const enableCoreTools = options.enableCoreTools || options.tools; // --tools now enables core tools
     const enablePlanningMode = options.planningMode;
     if (enableCoreTools || enableReadOnlyTools || enablePlanningMode) {
         const toolRegistry = builder.getToolRegistry();
         if (toolRegistry) {
-            // Configure basic tools with planning mode settings
+            // Configure basic tools 
             const basicToolsConfig = {};
-            if (enablePlanningMode) {
-                basicToolsConfig.planningMode = {
-                    enabled: true,
-                    reminderInterval: options.todoReminderInterval || 3,
-                    autoReminders: !options.disableAutoReminders
-                };
-            }
             // Register appropriate tool set based on flags
             if (enableCoreTools || enablePlanningMode) {
                 // Register all tools (including write/execute tools)
@@ -835,29 +892,54 @@ async function setupChat(options) {
                 // Register document tools (they are inherently read-only)
                 (0, majk_chat_document_tools_1.registerDocumentTools)(toolRegistry);
             }
-            // Setup planning mode reminders if enabled
-            if (options.planningMode) {
-                const instanceId = options.requestId || 'cli-session';
-                (0, majk_chat_basic_tools_1.setupPlanningModeReminders)(instanceId, basicToolsConfig);
-            }
             // Apply tool filtering if specified
             if (options.allowedTools || options.disallowedTools) {
                 applyToolFiltering(toolRegistry, options.allowedTools, options.disallowedTools);
             }
-            // Setup tool result truncation and auto-registration  
+            // Setup context management with truncation using ContextManagementExtension
             // Handle the case where toolResultLimit might be null or NaN from commander parsing
             let toolResultLimit = 2000; // Much smaller default to handle large files within context limits
             if (options.toolResultLimit && !isNaN(options.toolResultLimit) && options.toolResultLimit > 0) {
                 toolResultLimit = options.toolResultLimit;
-                // Override default context management if user specified custom tool result limit
-                builder.withContextManagement({
-                    enableTruncation: true,
-                    maxLength: toolResultLimit,
-                    conversationId: options.requestId || 'cli-session'
+            }
+            // Always setup context management with the extension (replaces legacy setupToolResultManagement)
+            builder.withContextManagement({
+                enableTruncation: true,
+                maxLength: toolResultLimit,
+                conversationId: options.requestId || 'cli-session'
+            });
+            // Setup prompt logging if requested
+            if (options.savePrompts) {
+                builder.withExtension(new majk_chat_core_1.PromptLoggingExtension({
+                    filePath: options.savePrompts,
+                    includeContext: true,
+                    includeTools: true,
+                    includeMessages: true,
+                    append: true
+                }));
+                console.log(chalk_1.default.cyan(`📝 Prompt logging enabled: ${options.savePrompts}`));
+            }
+            // Setup planning mode extension if requested
+            if (enablePlanningMode) {
+                builder.withPlanningMode({
+                    enabled: true,
+                    autoActivation: {
+                        enabled: true,
+                        complexityThreshold: 70
+                    },
+                    guidance: {
+                        reminderInterval: options.todoReminderInterval || 3,
+                        enableProgressTracking: !options.disableAutoReminders
+                    },
+                    session: {
+                        conversationId: options.requestId || 'cli-session'
+                    }
                 });
+                console.log(chalk_1.default.cyan(`🎯 Planning mode enabled: Research → Plan → Execute workflow`));
             }
-            setupToolResultManagement(builder, toolResultLimit, options);
-            builder.withAutoToolExecution(options.maxSteps || 5);
+            // Set default steps based on tool type - 500 for read-only tools by default, 5 for other scenarios
+            const defaultSteps = enableReadOnlyTools && !enableCoreTools && !enablePlanningMode ? 500 : 5;
+            builder.withAutoToolExecution(options.maxSteps || defaultSteps);
         }
     }
     let mcpPlugin = null;
@@ -867,14 +949,6 @@ async function setupChat(options) {
         // Enable auto tool execution if MCP is configured
         if (!options.tools) {
             builder.withAutoToolExecution(options.maxSteps || 5);
-            // Override default context management if user specified custom tool result limit
-            if (options.toolResultLimit && !isNaN(options.toolResultLimit) && options.toolResultLimit > 0) {
-                builder.withContextManagement({
-                    enableTruncation: true,
-                    maxLength: options.toolResultLimit,
-                    conversationId: options.requestId || 'cli-session'
-                });
-            }
         }
     }
     // Set tool callbacks if provided
@@ -921,6 +995,31 @@ async function setupChat(options) {
         }
     };
 }
+async function loadImageFromPath(filePath) {
+    const resolvedPath = path.resolve(filePath.replace(/^~/, process.env.HOME || '~'));
+    const ext = path.extname(resolvedPath).toLowerCase();
+    const mediaTypeMap = {
+        '.png': 'image/png',
+        '.jpg': 'image/jpeg',
+        '.jpeg': 'image/jpeg',
+        '.gif': 'image/gif',
+        '.webp': 'image/webp'
+    };
+    const media_type = mediaTypeMap[ext];
+    if (!media_type) {
+        throw new Error(`Unsupported image format: ${ext}. Supported: .png, .jpg, .jpeg, .gif, .webp`);
+    }
+    const buffer = await fs.readFile(resolvedPath);
+    const base64Data = buffer.toString('base64');
+    return {
+        type: 'image',
+        source: {
+            type: 'base64',
+            media_type,
+            data: base64Data
+        }
+    };
+}
 async function buildMessages(options) {
     const messages = [];
     // Add system message if provided
@@ -952,7 +1051,31 @@ async function buildMessages(options) {
         // Use traditional message options
         const message = await getMessage(options);
         if (message) {
-            messages.push({ role: 'user', content: message });
+            // Check if images are provided
+            if (options.image && Array.isArray(options.image) && options.image.length > 0) {
+                // Build multi-modal content with text + images
+                const contentBlocks = [];
+                // Add text block first
+                contentBlocks.push({
+                    type: 'text',
+                    text: message
+                });
+                // Add image blocks
+                for (const imagePath of options.image) {
+                    try {
+                        const imageBlock = await loadImageFromPath(imagePath);
+                        contentBlocks.push(imageBlock);
+                    }
+                    catch (error) {
+                        throw new Error(`Failed to load image ${imagePath}: ${error instanceof Error ? error.message : error}`);
+                    }
+                }
+                messages.push({ role: 'user', content: contentBlocks });
+            }
+            else {
+                // Simple text message
+                messages.push({ role: 'user', content: message });
+            }
         }
     }
     return messages;
@@ -1227,52 +1350,6 @@ function applyToolFiltering(registry, allowedTools, disallowedTools) {
         }
     }
 }
-/**
- * Setup tool result management with automatic ReadToolResult registration
- */
-function setupToolResultManagement(builder, resultLimit, options) {
-    let readToolResultRegistered = false;
-    const truncationConfig = {
-        maxLength: resultLimit,
-        previewLength: Math.floor(resultLimit * 0.6),
-        tailLength: Math.floor(resultLimit * 0.3),
-        storeResult: true
-    };
-    // Set up tool result callback to handle truncation
-    const originalOnToolResult = options.onToolResult;
-    const onToolResult = (toolName, result, context) => {
-        // Check if result should be truncated
-        if (majk_chat_basic_tools_1.ToolResultTruncator.shouldTruncate(result, truncationConfig)) {
-            // Set conversation ID from context if available
-            const conversationId = context?.metadata?.conversationId || context?.requestId || 'cli-session';
-            const configWithConversation = { ...truncationConfig, conversationId };
-            // Process the result with truncation
-            const truncatedResult = majk_chat_basic_tools_1.ToolResultTruncator.processToolResult(result, toolName, configWithConversation);
-            // Auto-register ReadToolResult tool on first truncation
-            if (!readToolResultRegistered && truncatedResult.truncated) {
-                const registry = builder.getToolRegistry();
-                if (registry && !registry.has('read_tool_result')) {
-                    registry.register(new majk_chat_basic_tools_1.ReadToolResultTool());
-                    readToolResultRegistered = true;
-                    console.log(chalk_1.default.yellow('📋 Large tool result detected. ReadToolResult tool auto-registered.'));
-                    console.log(chalk_1.default.gray(`    Use read_tool_result with ID: ${truncatedResult.full_result_id}`));
-                }
-            }
-            // Call original callback with truncated result
-            if (originalOnToolResult) {
-                originalOnToolResult(toolName, truncatedResult, context);
-            }
-            return truncatedResult;
-        }
-        // Call original callback for non-truncated results
-        if (originalOnToolResult) {
-            originalOnToolResult(toolName, result, context);
-        }
-        return result;
-    };
-    // Update the options to include our callback
-    options.onToolResult = onToolResult;
-}
 // Session helper functions
 async function handleListSessions(sessionManager, workingDirectory, outputHandler) {
     try {