@optiqcode/cli 1.5.0 → 1.7.0

package/dist/index.js

@@ -12,7 +12,7 @@ import { isValidDirectory, getGitIgnorePatterns, shouldIgnoreFile } from './util
 const BACKEND_URL = process.env.OPTIQ_BACKEND_URL || 'https://api.optiqcode.com';
 async function showBanner() {
     console.clear();
-    console.log(chalk.white.bold(`
+    console.log(chalk.cyan.bold(`
    ___        _   _       
   / _ \\ _ __ | |_(_) __ _ 
  | | | | '_ \\| __| |/ _\` |
@@ -20,28 +20,49 @@ async function showBanner() {
   \\___/| .__/ \\__|_|\\__, |
        |_|             |_|
   `));
-    console.log(chalk.gray('  Automatic code indexing\n'));
+    console.log(chalk.gray('  AI-powered code indexing & search'));
+    console.log(chalk.gray('  v1.6.0\n'));
+}
+function showHelp() {
+    console.log(chalk.cyan.bold('Optiq CLI') + chalk.gray(' - AI-powered code indexing\n'));
+    console.log(chalk.white('Usage:'));
+    console.log(chalk.gray('  optiq [command] [options]\n'));
+    console.log(chalk.white('Commands:'));
+    console.log(chalk.gray('  login           Login with email & OTP'));
+    console.log(chalk.gray('  index           Index current directory once'));
+    console.log(chalk.gray('  watch           Watch directory and auto-index changes'));
+    console.log(chalk.gray('  logout          Clear stored credentials'));
+    console.log(chalk.gray('  key             Show your API key'));
+    console.log(chalk.gray('  help            Show this help message\n'));
+    console.log(chalk.white('Options:'));
+    console.log(chalk.gray('  --path <dir>    Specify directory to index (default: current)\n'));
+    console.log(chalk.white('Examples:'));
+    console.log(chalk.gray('  optiq login'));
+    console.log(chalk.gray('  optiq index'));
+    console.log(chalk.gray('  optiq watch'));
+    console.log(chalk.gray('  optiq index --path /path/to/project\n'));
+    console.log(chalk.gray('Get started: https://github.com/optiqcode/optiq'));
 }
 async function login() {
-    console.log(chalk.white('🔐 Passwordless login\n'));
+    console.log(chalk.cyan('🔐 Login\n'));
     const { email } = await prompts({
         type: 'text',
         name: 'email',
         message: 'Email:',
-        validate: (value) => value.includes('@') || 'Please enter a valid email',
+        validate: (value) => value.includes('@') || 'Invalid email',
     });
     if (!email) {
-        console.log(chalk.gray('\n⚠️  Login cancelled'));
+        console.log(chalk.gray('\nCancelled'));
         process.exit(0);
     }
-    const spinner = ora({ text: 'Sending code...', color: 'white' }).start();
+    const spinner = ora({ text: 'Sending code...', color: 'cyan' }).start();
     try {
         // Send OTP
         const otpResponse = await axios.post(`${BACKEND_URL}/api/auth/send-otp`, { email }, { timeout: 10000 });
         if (!otpResponse.data.success) {
             throw new Error('Failed to send code');
         }
-        spinner.succeed(chalk.white('✓ Code sent to your email\n'));
+        spinner.succeed(chalk.cyan('Code sent\n'));
         const { code } = await prompts({
             type: 'text',
             name: 'code',
@@ -52,10 +73,10 @@ async function login() {
             },
         });
         if (!code) {
-            console.log(chalk.gray('\n⚠️  Login cancelled'));
+            console.log(chalk.gray('\nCancelled'));
             return false;
         }
-        const verifySpinner = ora({ text: 'Verifying...', color: 'white' }).start();
+        const verifySpinner = ora({ text: 'Verifying...', color: 'cyan' }).start();
         // Verify OTP
         const verifyResponse = await axios.post(`${BACKEND_URL}/api/auth/verify-otp`, { email, code }, { timeout: 10000 });
         if (verifyResponse.data.success) {
@@ -82,29 +103,95 @@ async function login() {
                 token: token,
                 apiKey: validateResponse.data.context_engine_api_key || '',
             });
-            verifySpinner.succeed(chalk.white(`✓ Logged in as ${email}\n`));
+            verifySpinner.succeed(chalk.cyan(`Logged in as ${email}\n`));
             return true;
         }
         else {
-            verifySpinner.fail(chalk.gray('✗ Invalid code'));
+            verifySpinner.fail(chalk.red('Invalid code'));
             return false;
         }
     }
     catch (error) {
-        spinner.fail(chalk.gray('✗ Login failed'));
+        spinner.fail(chalk.red('Login failed'));
         if (error.response?.data?.error) {
-            console.log(chalk.gray(error.response.data.error));
+            console.log(chalk.gray('   ' + error.response.data.error));
         }
         else {
-            console.log(chalk.gray(error.message));
+            console.log(chalk.gray('   ' + error.message));
         }
         return false;
     }
 }
 async function main() {
-    await showBanner();
-    // Check if logged in
+    const args = process.argv.slice(2);
+    const command = args[0];
+    // Parse --path option
+    const pathIndex = args.indexOf('--path');
+    const targetPath = pathIndex >= 0 && args[pathIndex + 1]
+        ? path.resolve(args[pathIndex + 1])
+        : path.resolve(process.cwd());
+    // Handle commands
+    if (command === 'help' || command === '--help' || command === '-h') {
+        showHelp();
+        return;
+    }
+    if (command === 'login') {
+        await showBanner();
+        const success = await login();
+        process.exit(success ? 0 : 1);
+    }
+    if (command === 'logout') {
+        const { clearConfig } = await import('./utils/config.js');
+        await clearConfig();
+        console.log(chalk.cyan('✓ Logged out successfully'));
+        process.exit(0);
+    }
+    if (command === 'key') {
+        const config = await getConfig();
+        if (!config) {
+            console.log(chalk.red('✗ Not logged in'));
+            console.log(chalk.gray('Run: optiq login'));
+            process.exit(1);
+        }
+        console.log(chalk.cyan('\n🔑 Your API Key:\n'));
+        console.log(chalk.white(config.apiKey || 'No API key found'));
+        console.log(chalk.gray('\nUse this for the MCP server or direct API calls'));
+        console.log(chalk.gray('Keep this secret!\n'));
+        process.exit(0);
+    }
+    // Check authentication for index/watch commands
     let config = await getConfig();
+    if (command === 'index' || command === 'watch') {
+        if (!config) {
+            console.log(chalk.red('✗ Not logged in'));
+            console.log(chalk.gray('Run: optiq login'));
+            process.exit(1);
+        }
+        // Safety check
+        const homeDir = process.env.HOME || process.env.USERPROFILE;
+        if (homeDir && path.resolve(targetPath) === path.resolve(homeDir)) {
+            console.log(chalk.red('✗ Cannot index home directory'));
+            console.log(chalk.gray('Specify a project directory'));
+            process.exit(1);
+        }
+        // Validate directory
+        const validation = await isValidDirectory(targetPath);
+        if (!validation.valid) {
+            console.log(chalk.red(`✗ ${validation.error}`));
+            process.exit(1);
+        }
+        console.log(chalk.cyan('📁 ' + path.basename(targetPath)));
+        console.log(chalk.gray(`   ${validation.fileCount} files • ${targetPath}\n`));
+        if (command === 'index') {
+            await indexOnce(targetPath, config);
+        }
+        else {
+            await watchDirectory(targetPath, config);
+        }
+        return;
+    }
+    // Interactive mode if no command
+    await showBanner();
     if (!config) {
         const success = await login();
         if (!success) {
@@ -116,54 +203,49 @@ async function main() {
         }
     }
     else {
-        console.log(chalk.white('✓ Logged in as'), chalk.white.bold(config.email));
+        console.log(chalk.cyan('✓ ' + config.email));
         console.log();
     }
-    const targetPath = path.resolve(process.cwd());
-    // Safety check: prevent indexing home directory
+    // Safety check
     const homeDir = process.env.HOME || process.env.USERPROFILE;
     if (homeDir && path.resolve(targetPath) === path.resolve(homeDir)) {
-        console.log(chalk.gray('✗ Cannot index home directory'));
-        console.log(chalk.gray('Please run this from a project directory'));
+        console.log(chalk.red('✗ Cannot index home directory'));
         process.exit(1);
     }
     // Validate directory
     const validation = await isValidDirectory(targetPath);
     if (!validation.valid) {
-        console.log(chalk.gray(`✗ ${validation.error}`));
+        console.log(chalk.red(`✗ ${validation.error}`));
         process.exit(1);
     }
-    console.log(chalk.white('📁 Directory:'), chalk.white.bold(path.basename(targetPath)));
-    console.log(chalk.gray(`   ${validation.fileCount} files found`));
-    console.log(chalk.gray(`   ${targetPath}\n`));
+    console.log(chalk.cyan('📁 ' + path.basename(targetPath)));
+    console.log(chalk.gray(`   ${validation.fileCount} files • ${targetPath}\n`));
     // Ask what to do
     const { action } = await prompts({
         type: 'select',
         name: 'action',
-        message: 'What would you like to do?',
+        message: 'Choose action:',
         choices: [
-            { title: '👀 Watch and auto-index changes', value: 'watch' },
             { title: '📦 Index once', value: 'index' },
-            { title: '🔑 Show API Key', value: 'show-api-key' },
+            { title: '👀 Watch & auto-index', value: 'watch' },
+            { title: '🔑 Show API Key', value: 'key' },
             { title: '🚪 Logout', value: 'logout' },
-            { title: '❌ Exit', value: 'exit' },
         ],
     });
-    if (action === 'exit') {
-        console.log(chalk.gray('\nGoodbye!'));
+    if (!action) {
+        console.log(chalk.gray('\nCancelled'));
         process.exit(0);
     }
-    if (action === 'show-api-key') {
-        console.log(chalk.white('\n🔑 Your Context Engine API Key:\n'));
-        console.log(chalk.white.bold(config.apiKey || 'No API key found'));
-        console.log(chalk.gray('\nUse this key to configure the Optiq MCP server or make API calls.'));
-        console.log(chalk.gray('Keep this key secret and never share it publicly.\n'));
+    if (action === 'key') {
+        console.log(chalk.cyan('\n🔑 Your API Key:\n'));
+        console.log(chalk.white(config.apiKey));
+        console.log(chalk.gray('\nKeep this secret!\n'));
         process.exit(0);
     }
     if (action === 'logout') {
         const { clearConfig } = await import('./utils/config.js');
         await clearConfig();
-        console.log(chalk.white('\n✓ Logged out successfully'));
+        console.log(chalk.cyan('\n✓ Logged out'));
         process.exit(0);
     }
     if (action === 'index') {
@@ -174,53 +256,72 @@ async function main() {
     }
 }
 async function indexOnce(targetPath, config) {
-    const spinner = ora({ text: 'Collecting files...', color: 'white' }).start();
+    const spinner = ora({ text: 'Collecting files...', color: 'cyan' }).start();
     try {
         const files = await collectFiles(targetPath);
         spinner.text = `Reading ${files.length} files...`;
         const fileContents = {};
+        let processed = 0;
         for (const file of files) {
             try {
                 const content = await fs.readFile(file, 'utf-8');
-                const relativePath = path.relative(targetPath, file);
+                const relativePath = path.relative(targetPath, file).replace(/\\/g, '/');
                 fileContents[relativePath] = content;
+                processed++;
+                if (processed % 50 === 0) {
+                    spinner.text = `Reading files... ${processed}/${files.length}`;
+                }
             }
             catch (error) {
-                // Skip files that can't be read
+                // Skip unreadable files
             }
         }
-        spinner.text = 'Uploading to Optiq...';
         const filesArray = Object.entries(fileContents).map(([path, content]) => ({
             path,
             content,
         }));
-        const response = await axios.post(`${BACKEND_URL}/api/nexus/index/content`, {
-            repository_path: targetPath,
-            files: filesArray,
-        }, {
-            headers: {
-                'X-API-Key': config.apiKey,
-                'Content-Type': 'application/json',
-            },
-            timeout: 0, // No timeout for large codebases
-        });
-        if (response.data.success) {
-            spinner.succeed(chalk.white('✓ Indexing complete'));
-            console.log(chalk.white('\n📊 Repository ID:'), chalk.white.bold(response.data.repo_id));
-            console.log(chalk.gray('   Use this with the MCP server or API\n'));
-        }
-        else {
-            spinner.fail(chalk.gray('✗ Indexing failed'));
-            console.log(chalk.gray(response.data.error || 'Unknown error'));
+        // Batch upload
+        const BATCH_SIZE = 50;
+        let totalFiles = 0;
+        let totalEntities = 0;
+        let repoId = '';
+        for (let i = 0; i < filesArray.length; i += BATCH_SIZE) {
+            const batch = filesArray.slice(i, i + BATCH_SIZE);
+            const batchNum = Math.floor(i / BATCH_SIZE) + 1;
+            const totalBatches = Math.ceil(filesArray.length / BATCH_SIZE);
+            spinner.text = `Uploading... batch ${batchNum}/${totalBatches}`;
+            const response = await axios.post(`${BACKEND_URL}/api/nexus/index/content`, {
+                repository_path: targetPath,
+                files: batch,
+            }, {
+                headers: {
+                    'X-API-Key': config.apiKey,
+                    'Content-Type': 'application/json',
+                },
+                timeout: 0,
+            });
+            if (!response.data.success) {
+                spinner.fail(chalk.red('Indexing failed'));
+                console.log(chalk.gray(response.data.error || 'Unknown error'));
+                return;
+            }
+            repoId = response.data.repo_id;
+            totalFiles += response.data.stats?.files_indexed || 0;
+            totalEntities += response.data.stats?.entities_indexed || 0;
         }
+        spinner.succeed(chalk.cyan('Indexed'));
+        console.log(chalk.gray(`   ${totalFiles} files • ${totalEntities} entities`));
+        console.log(chalk.cyan('\n📊 Repository ID:'));
+        console.log(chalk.white(`   ${repoId}`));
+        console.log(chalk.gray('\n   Use this ID with the MCP server\n'));
     }
     catch (error) {
-        spinner.fail(chalk.gray('✗ Indexing failed'));
+        spinner.fail(chalk.red('✗ Failed'));
         if (error.response?.data?.error) {
-            console.log(chalk.gray(error.response.data.error));
+            console.log(chalk.gray('   ' + error.response.data.error));
         }
         else {
-            console.log(chalk.gray(error.message));
+            console.log(chalk.gray('   ' + error.message));
         }
     }
 }
@@ -238,9 +339,8 @@ async function watchDirectory(targetPath, config) {
             const existingRepo = repoListResponse.data.repositories.find((r) => r.path === targetPath);
             if (existingRepo) {
                 repoId = existingRepo.id;
-                console.log(chalk.white('✓ Repository already indexed'));
-                console.log(chalk.white('📊 Repository ID:'), chalk.white.bold(repoId));
-                console.log();
+                console.log(chalk.cyan('✓ Already indexed'));
+                console.log(chalk.gray(`   Repo ID: ${repoId}\n`));
             }
         }
     }
@@ -300,22 +400,20 @@ async function watchDirectory(targetPath, config) {
                 repoId = response.data.repo_id;
                 uploadedCount += batch.length;
             }
-            spinner.succeed(chalk.white(`Indexed ${files.length} files`));
-            console.log(chalk.gray('Repository ID:'), chalk.white.bold(repoId));
-            console.log();
+            spinner.succeed(chalk.cyan(`Indexed ${files.length} files`));
+            console.log(chalk.gray(`   Repo ID: ${repoId}\n`));
         }
         catch (error) {
-            spinner.fail(chalk.gray('✗ Initial indexing failed'));
+            spinner.fail(chalk.red('Failed'));
             if (error.response?.data?.error) {
-                console.log(chalk.gray(error.response.data.error));
+                console.log(chalk.gray('   ' + error.response.data.error));
             }
             else {
-                console.log(chalk.gray(error.message));
+                console.log(chalk.gray('   ' + error.message));
             }
             return;
         }
     }
-    console.log(chalk.white('👀 Watching for changes...\n'));
     const ignorePatterns = await getGitIgnorePatterns(targetPath);
     const watcher = chokidar.watch(targetPath, {
         ignored: (filePath) => {
@@ -352,17 +450,14 @@ async function watchDirectory(targetPath, config) {
         const uptime = formatUptime(Date.now() - sessionStartTime);
         const timeSinceLastIndex = Math.floor((Date.now() - lastIndexedTime) / 1000);
         const lines = [];
-        lines.push(chalk.white.bold('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
-        lines.push(`${chalk.cyan('📊 Session Stats')}`);
-        lines.push(`   ${chalk.gray('Uptime:')} ${chalk.white(uptime)}`);
-        lines.push(`   ${chalk.gray('Total Indexed:')} ${chalk.white(totalIndexed)} ${chalk.gray('changes')}`);
-        lines.push(`   ${chalk.gray('Unique Files:')} ${chalk.white(allIndexedFiles.size)}`);
-        lines.push('');
-        lines.push(`${chalk.green('●')} ${chalk.gray('Last Activity:')} ${chalk.white(lastIndexedFile || 'None')}`);
+        lines.push(chalk.gray('─'.repeat(50)));
+        lines.push(`${chalk.cyan('👀 Watching')} ${chalk.gray('•')} ${chalk.white(uptime)} ${chalk.gray('uptime')}`);
+        lines.push(`${chalk.gray('   Indexed:')} ${chalk.white(totalIndexed)} ${chalk.gray('changes')} ${chalk.gray('•')} ${chalk.white(allIndexedFiles.size)} ${chalk.gray('files')}`);
         if (lastIndexedFile) {
-            lines.push(`   ${chalk.gray(`${timeSinceLastIndex}s ago`)}`);
+            const timeStr = timeSinceLastIndex < 60 ? `${timeSinceLastIndex}s` : `${Math.floor(timeSinceLastIndex / 60)}m`;
+            lines.push(`${chalk.gray('   Last:')} ${chalk.white(lastIndexedFile)} ${chalk.gray(`(${timeStr} ago)`)}`);
         }
-        lines.push(chalk.white.bold('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
+        lines.push(chalk.gray('─'.repeat(50)));
         lines.push('');
         logUpdate(lines.join('\n'));
     };
@@ -436,14 +531,14 @@ async function watchDirectory(targetPath, config) {
             }
             else {
                 logUpdate.clear();
-                console.log(chalk.gray(`✗ Indexing failed`));
-                console.log(chalk.gray(response.data.error));
+                console.log(chalk.red(`✗ Failed to index`));
+                console.log(chalk.gray(`   ${response.data.error}`));
             }
         }
         catch (error) {
             logUpdate.clear();
-            console.log(chalk.gray(`✗ Indexing failed`));
-            console.log(chalk.gray(error.response?.data || error.message));
+            console.log(chalk.red(`✗ Failed to index`));
+            console.log(chalk.gray(`   ${error.response?.data?.error || error.message}`));
         }
         isProcessing = false;
         // Check if there are more pending changes and process them
@@ -471,11 +566,12 @@ async function watchDirectory(targetPath, config) {
         scheduleProcess();
     })
         .on('error', (error) => {
-        console.log(chalk.gray('✗ Watcher error:'), error.message);
+        logUpdate.clear();
+        console.log(chalk.red('✗ Watcher error:'), chalk.gray(error.message));
     });
-    console.log(chalk.gray('Press Ctrl+C to stop\n'));
     process.on('SIGINT', () => {
-        console.log(chalk.gray('\n\n⚠️  Stopping watcher...'));
+        logUpdate.clear();
+        console.log(chalk.cyan('\n✓ Stopped watching'));
         watcher.close();
         process.exit(0);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optiqcode/cli",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "CLI tool for Optiq - automatic code indexing and context engine",
   "type": "module",
   "main": "dist/index.js",