codehere 0.1.0 → 0.3.0

package/dist/index.js

@@ -4,15 +4,24 @@ import { config } from 'dotenv';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { indexRepositoryParallel } from './embed.js';
-import { searchIntelligent } from './search.js';
-import { chatWithContext } from './chat.js';
-import { generateAndApplyEdit, generateEditDryRun } from './edit.js';
-import { scaffoldTemplate, listTemplates } from './scaffold.js';
+import { generateAndApplyEdit } from './edit.js';
+import { executeAskCommand } from './presentation/cli/commands/ask-command.js';
+import { executeReactCommand } from './presentation/cli/commands/react-command.js';
+import { executeSmartCommand } from './presentation/cli/commands/smart-command.js';
+import { executeSetupCommand } from './presentation/cli/commands/setup-command.js';
+import { executeConfigCommand } from './presentation/cli/commands/config-command.js';
+import { executeHelpCommand } from './presentation/cli/commands/help-command.js';
 import { initLogFile, logEntry } from './log.js';
 import { performHealthCheck, formatHealthStatus, getMetrics } from './monitoring.js';
 import { refactorMultiFile, findFilesByPattern } from './refactor.js';
-import { getGitStatus, formatGitStatus, getAllGitDiffs, analyzeDiff } from './git.js';
-import { planTask, executePlan, formatPlan } from './planner.js';
+import { getGitStatus, formatGitStatus, getAllGitDiffs, analyzeDiff, getGitDiff } from './git.js';
+import { executePlanCommand } from './presentation/cli/commands/plan-command.js';
+import { executeOrchestrateCommand } from './presentation/cli/commands/orchestrate-command.js';
+import { executeDecisionCommand } from './presentation/cli/commands/decision-command.js';
+import { executeKnowledgeCommand } from './presentation/cli/commands/knowledge-command.js';
+import { executeLearningDashboardCommand } from './presentation/cli/commands/learning-dashboard-command.js';
+import { executeTraceCommand } from './presentation/cli/commands/trace-command.js';
+import { executeUndoCommand } from './presentation/cli/commands/undo-command.js';
 import { reviewFile, formatReview } from './review.js';
 import { formatLearningInsights, getPerformanceInsights } from './learning.js';
 import { getCacheStats, clearAllCaches } from './cache.js';
@@ -21,8 +30,8 @@ import { generateFileDocs, generateREADME, updateDocs, saveDocs } from './docs.j
 import { generateTests, getTestFilePath, saveTests, improveTests } from './testgen.js';
 import { startSession } from './session.js';
 import { cleanResponse } from './formatter.js';
-import { readFileSync } from 'fs';
-import { colors, createSpinner, createBanner, createTable, success, error, warning, info, formatPath, formatNumber, formatScore, formatPercent, sectionHeader, newline, statusIndicator, createWelcomeMessage, } from './ui.js';
+import { displayError } from './presentation/cli/error-display.js';
+import { colors, createSpinner, createBanner, createTable, success, error, warning, info, formatPath, formatNumber, sectionHeader, newline, statusIndicator, createWelcomeMessage, } from './ui.js';
 // Load environment variables - try agent directory first, then current directory
 try {
     const __filename = fileURLToPath(import.meta.url);
@@ -34,11 +43,13 @@ catch {
     // Fallback to current directory
 }
 config(); // Also try current directory
+// Import centralized version utility
+import { getVersion } from './utils/version.js';
 const program = new Command();
 program
     .name('codehere')
     .description('AI-powered coding assistant with local embeddings and semantic search')
-    .version('0.1.0')
+    .version(getVersion())
     .configureHelp({
     helpWidth: 80,
     sortSubcommands: true,
@@ -46,11 +57,40 @@ program
     .addHelpText('beforeAll', () => {
     return createWelcomeMessage();
 });
-// Start interactive session when no command provided
+// Smart routing: if query provided as argument, route intelligently
 program
-    .action(async () => {
-    // Check if we should start interactive session
-    if (process.stdin.isTTY) {
+    .argument('[query]', 'Your query - Codehere will understand what you need')
+    .action(async (query) => {
+    if (query && query.trim()) {
+        // Direct query - use intelligent router
+        initLogFile();
+        if (!process.env.COHERE_API_KEY) {
+            newline();
+            console.error(error('COHERE_API_KEY not found in environment'));
+            newline();
+            console.log(colors.bold('Setup Instructions:'));
+            console.log('  1. Get your API key from: https://dashboard.cohere.com/api-keys');
+            console.log('  2. Create a .env file in your project root:');
+            console.log(colors.cyan('     echo "COHERE_API_KEY=your_key_here" > .env'));
+            console.log('  3. Run the command again');
+            newline();
+            process.exit(1);
+        }
+        try {
+            await executeSmartCommand(query.trim());
+            logEntry({
+                timestamp: new Date().toISOString(),
+                command: 'smart',
+                query: query.trim(),
+                policyStatus: 'allowed',
+            });
+        }
+        catch (err) {
+            console.error(error('Error:'), err instanceof Error ? err.message : String(err));
+            process.exit(1);
+        }
+    }
+    else if (process.stdin.isTTY) {
         // Interactive mode - start session
         await startSession();
     }
@@ -58,18 +98,44 @@ program
         // Non-interactive - show help
         console.log(createWelcomeMessage());
         newline();
-        console.log(colors.bold('Available Commands:'));
+        console.log(colors.bold('Usage:'));
         newline();
+        console.log(colors.cyan('  codehere "<your query>"') + '     Ask anything - Codehere understands');
         console.log(colors.cyan('  codehere') + '                    Start interactive session');
         console.log(colors.cyan('  codehere index') + '              Build embeddings index');
-        console.log(colors.cyan('  codehere ask "<question>"') + '    Ask questions');
-        console.log(colors.cyan('  codehere explain <file>') + '     Explain a file');
-        console.log(colors.cyan('  codehere fix <file> "<instruction>"') + '  Edit files');
+        newline();
+        console.log(colors.dim('Examples:'));
+        console.log(colors.dim('  codehere "How does authentication work?"'));
+        console.log(colors.dim('  codehere "Explain src/auth.ts"'));
+        console.log(colors.dim('  codehere "Fix src/utils.ts add error handling"'));
         newline();
         console.log(colors.dim('Run "codehere --help" for all commands'));
         newline();
     }
 });
+program
+    .command('setup')
+    .description('Interactive setup wizard for first-time users')
+    .option('-f, --force', 'Force reconfiguration even if already set up')
+    .action(async (options) => {
+    await executeSetupCommand(options.force || false);
+});
+program
+    .command('config')
+    .description('Manage configuration and preferences')
+    .argument('[action]', 'Action: show, get, set, reset')
+    .argument('[key]', 'Preference key (for get/set)')
+    .argument('[value]', 'Preference value (for set)')
+    .action(async (action, key, value) => {
+    await executeConfigCommand(action, key, value);
+});
+program
+    .command('help')
+    .description('Show help for commands')
+    .argument('[command]', 'Command name to get help for')
+    .action(async (commandName) => {
+    await executeHelpCommand(commandName);
+});
 program
     .command('index')
     .description('Build embeddings index of the repository')
@@ -149,49 +215,20 @@ Make sure to run "codehere index" first!
         console.log(colors.bold('Query:'));
         console.log(colors.cyan('  ' + question));
         newline();
-        // NEW: Intelligent search with AST-based understanding
-        const searchSpinner = createSpinner('Searching with intelligent context (AST + code structure)...');
+        // Use clean architecture
+        const searchSpinner = createSpinner('Searching codebase...');
         searchSpinner.start();
-        const searchResult = await searchIntelligent(question, {
-            baseDir: process.cwd(),
-        });
-        searchSpinner.stop();
-        if (searchResult.chunks.length === 0) {
-            newline();
-            console.log(warning('No relevant code found.'));
-            console.log(info('Make sure to run "codehere index" first to build the search index.'));
-            newline();
-            return;
+        try {
+            await executeAskCommand(question);
+        }
+        finally {
+            searchSpinner.stop();
         }
-        // Display search results
-        sectionHeader('Search Results (Intelligent)');
-        const fileTable = createTable(['File', 'Relevance', 'Preview'], searchResult.chunks.slice(0, 10).map(r => [
-            formatPath(r.filepath),
-            formatScore(r.score),
-            colors.dim(r.content.substring(0, 50) + '...'),
-        ]));
-        console.log(fileTable.toString());
-        const retrievedFiles = [...new Set(searchResult.chunks.map(r => r.filepath))];
-        console.log(colors.dim(`\nFound ${formatNumber(searchResult.chunks.length)} optimized chunks from ${formatNumber(retrievedFiles.length)} file(s)`));
-        console.log(colors.dim(`Token reduction: ${formatPercent(searchResult.reductionPercent)} (${formatNumber(searchResult.tokenEstimate)} tokens)`));
-        newline();
-        // Generate response with spinner
-        const responseSpinner = createSpinner('Generating response with optimized context...');
-        responseSpinner.start();
-        const response = await chatWithContext(question, searchResult.chunks);
-        responseSpinner.stop();
-        newline();
-        // Display response - clean format
-        sectionHeader('Response');
-        const formattedResponse = cleanResponse(response);
-        console.log(formattedResponse);
-        newline();
         logEntry({
             timestamp: new Date().toISOString(),
             command: 'ask',
             query: question,
             policyStatus: 'allowed',
-            retrievedFiles,
         });
     }
     catch (err) {
@@ -204,7 +241,6 @@ program
     .description('Apply AI-generated code edits to a file')
     .argument('<file>', 'Path to the file to edit')
     .argument('<instruction>', 'Natural language instruction for the edit')
-    .option('--dry-run', 'Show changes without applying them')
     .alias('edit')
     .addHelpText('after', `
 Examples:
@@ -223,7 +259,7 @@ Safety policies:
   • Cannot edit files in restricted folders (infra/, billing/)
   • Only one file can be edited at a time
   `)
-    .action(async (file, instruction, options) => {
+    .action(async (file, instruction) => {
     initLogFile();
     if (!process.env.COHERE_API_KEY) {
         newline();
@@ -252,17 +288,18 @@ Safety policies:
         const fullPath = join(process.cwd(), file);
         if (!existsSync(fullPath)) {
             diffSpinner.stop();
-            newline();
-            console.error(error(`File not found: ${file}`));
+            displayError(new Error(`File not found: ${file}`), {
+                operation: 'edit',
+                query: instruction,
+                filepath: file,
+                showSuggestions: true,
+            });
             console.log(info(`Looking for: ${fullPath}`));
             console.log(info('Tip: Use a relative path from your current directory'));
             newline();
             process.exit(1);
         }
-        const isDryRun = options.dryRun || false;
-        const result = isDryRun
-            ? await generateEditDryRun(file, instruction)
-            : await generateAndApplyEdit(file, instruction);
+        const result = await generateAndApplyEdit(file, instruction);
         diffSpinner.stop();
         if (result.success) {
             newline();
@@ -289,32 +326,7 @@ Safety policies:
                 console.log(statsTable.toString());
                 newline();
             }
-            // Show diff in dry-run mode
-            if (isDryRun && 'diffText' in result && result.diffText) {
-                sectionHeader('Generated Diff (Dry Run)');
-                console.log(colors.dim('---'));
-                console.log(result.diffText);
-                console.log(colors.dim('---'));
-                newline();
-                if ('syntaxValid' in result) {
-                    if (result.syntaxValid === false) {
-                        console.log(warning('⚠️  Syntax validation failed'));
-                        console.log(colors.yellow('  ' + (result.error || 'Unknown syntax error')));
-                        newline();
-                    }
-                    else if (result.syntaxValid === true) {
-                        console.log(success('✓ Syntax validation passed'));
-                        newline();
-                    }
-                }
-            }
-            if (isDryRun) {
-                console.log(info('Dry-run mode: No changes were applied to the file.'));
-                console.log(info('Remove --dry-run to apply changes.'));
-            }
-            else {
-                console.log(success('Edit applied successfully'));
-            }
+            console.log(success('Edit applied successfully'));
             logEntry({
                 timestamp: new Date().toISOString(),
                 command: 'fix',
@@ -325,18 +337,13 @@ Safety policies:
             });
         }
         else {
-            newline();
-            // Show policy rejection reason
-            newline();
-            sectionHeader('Error');
-            if (result.policyResult && !result.policyResult.allowed) {
-                console.log(error('Policy check failed'));
-                console.log(colors.yellow('  ' + (result.policyResult.reason || 'Unknown reason')));
-            }
-            else {
-                console.log(error('Edit failed'));
-                console.log(colors.red('  ' + (result.error || 'Unknown error')));
-            }
+            // Use centralized error display
+            const errorMessage = result.policyResult && !result.policyResult.allowed
+                ? result.policyResult.reason || 'Policy check failed'
+                : result.error || 'Edit failed';
+            const policyError = result.policyResult && !result.policyResult.allowed
+                ? new Error(`Policy check failed: ${result.policyResult.reason || 'Unknown reason'}`)
+                : new Error(`Edit failed: ${result.error || 'Unknown error'}`);
             logEntry({
                 timestamp: new Date().toISOString(),
                 command: 'fix',
@@ -346,59 +353,22 @@ Safety policies:
                 policyStatus: 'rejected',
                 policyReason: result.error,
             });
+            displayError(policyError, {
+                operation: 'edit',
+                query: instruction,
+                filepath: file,
+                showSuggestions: true,
+            });
             process.exit(1);
         }
     }
     catch (err) {
-        console.error(error('Error:'), err instanceof Error ? err.message : String(err));
-        process.exit(1);
-    }
-});
-program
-    .command('debug-search')
-    .description('Debug search: show top results with scores and previews')
-    .argument('<query>', 'Search query')
-    .option('-n, --top <number>', 'Number of results to show', '10')
-    .action(async (query, options) => {
-    initLogFile();
-    if (!process.env.COHERE_API_KEY) {
-        newline();
-        console.error(error('COHERE_API_KEY not found in environment'));
-        process.exit(1);
-    }
-    try {
-        console.log(createBanner('Debug Search', 'Show search results with scores'));
-        newline();
-        console.log(colors.bold('Query:'));
-        console.log(colors.cyan('  ' + query));
-        newline();
-        const searchSpinner = createSpinner('Searching...');
-        searchSpinner.start();
-        const searchResult = await searchIntelligent(query, {
-            baseDir: process.cwd(),
+        displayError(err, {
+            operation: 'edit',
+            query: instruction,
+            filepath: file,
+            showSuggestions: true,
         });
-        searchSpinner.stop();
-        if (searchResult.chunks.length === 0) {
-            newline();
-            console.log(warning('No results found.'));
-            return;
-        }
-        const topN = parseInt(options.top || '10', 10);
-        const topResults = searchResult.chunks.slice(0, topN);
-        sectionHeader('Search Results');
-        const fileTable = createTable(['Rank', 'File', 'Score', 'Preview'], topResults.map((r, idx) => [
-            String(idx + 1),
-            formatPath(r.filepath),
-            formatScore(r.score),
-            colors.dim(r.content.substring(0, 60) + '...'),
-        ]));
-        console.log(fileTable.toString());
-        newline();
-        console.log(colors.dim(`Showing ${topResults.length} of ${searchResult.chunks.length} results`));
-        console.log(colors.dim(`Token reduction: ${formatPercent(searchResult.reductionPercent)}`));
-    }
-    catch (err) {
-        console.error(error('Search error:'), err instanceof Error ? err.message : String(err));
         process.exit(1);
     }
 });
@@ -446,34 +416,28 @@ This command will:
             newline();
             process.exit(1);
         }
-        const content = readFileSync(fullPath, 'utf-8');
-        // File info
-        const lines = content.split('\n').length;
-        const size = (content.length / 1024).toFixed(2);
-        console.log(colors.bold('File:') + ' ' + formatPath(file));
-        console.log(colors.dim(`  Lines: ${lines} | Size: ${size} KB`));
-        newline();
-        const context = [{
-                filepath: file,
-                content: content,
-                score: 1.0,
-            }];
-        const question = `Explain this file: ${file}`;
-        // Generate explanation with spinner
+        // Use clean architecture
+        const { container } = await import('./application/services/dependency-container.js');
+        const useCase = container.explainFileUseCase;
         const explainSpinner = createSpinner('Generating explanation...');
         explainSpinner.start();
-        const response = await chatWithContext(question, context);
+        const result = await useCase.execute({ filepath: file });
         explainSpinner.stop();
+        // File info
+        const lines = result.fileContent.split('\n').length;
+        const size = (result.fileContent.length / 1024).toFixed(2);
+        console.log(colors.bold('File:') + ' ' + formatPath(file));
+        console.log(colors.dim(`  Lines: ${lines} | Size: ${size} KB`));
         newline();
-        // Display explanation - clean format
+        // Display explanation
         sectionHeader('Explanation');
-        const formattedResponse = cleanResponse(response);
+        const formattedResponse = cleanResponse(result.explanation);
         console.log(formattedResponse);
         newline();
         logEntry({
             timestamp: new Date().toISOString(),
             command: 'explain',
-            query: question,
+            query: `Explain ${file}`,
             filepath: file,
             policyStatus: 'allowed',
             retrievedFiles: [file],
@@ -613,7 +577,6 @@ program
             return;
         }
         // Get diffs
-        const { getGitDiff } = require('./git.js');
         const diffs = options.file
             ? (() => {
                 const diff = getGitDiff(options.file);
@@ -660,32 +623,69 @@ program
         newline();
         console.log(colors.bold('Instruction:') + ' ' + colors.cyan(instruction));
         newline();
-        const plan = await planTask(instruction);
-        sectionHeader('Execution Plan');
-        console.log(formatPlan(plan));
-        if (options.execute) {
-            newline();
-            const searchSpinner = createSpinner('Executing plan...');
-            searchSpinner.start();
-            const result = await executePlan(plan, { instruction });
-            searchSpinner.stop();
-            newline();
-            sectionHeader('Execution Results');
-            const resultsTable = createTable(['Metric', 'Value'], [
-                ['Tasks Completed', formatNumber(result.completedTasks)],
-                ['Total Tasks', formatNumber(plan.tasks.length)],
-                ['Success', result.success ? statusIndicator('success') + ' Yes' : statusIndicator('error') + ' No'],
-                ['Errors', formatNumber(result.errors.length)],
-            ]);
-            console.log(resultsTable.toString());
-            if (result.errors.length > 0) {
-                newline();
-                sectionHeader('Errors');
-                result.errors.forEach(err => {
-                    console.log(error(`${err.task}: ${err.error}`));
-                });
-            }
-        }
+        // Use new memory-based planning
+        await executePlanCommand(instruction, { execute: options.execute });
+    }
+    catch (err) {
+        console.error(error('Error:'), err instanceof Error ? err.message : String(err));
+        process.exit(1);
+    }
+});
+program
+    .command('decision')
+    .description('Record and query architectural/design decisions')
+    .argument('<action>', 'Action: record, list, query, or explain')
+    .argument('[args...]', 'Arguments for the action')
+    .option('-c, --codebase <path>', 'Codebase path (default: current directory)')
+    .option('-t, --type <type>', 'Decision type filter (for list)')
+    .option('-l, --limit <number>', 'Limit number of results', '10')
+    .action(async (action, args, options) => {
+    initLogFile();
+    try {
+        await executeDecisionCommand(action, args, {
+            codebase: options.codebase,
+            type: options.type,
+            limit: options.limit ? parseInt(options.limit, 10) : undefined,
+        });
+    }
+    catch (err) {
+        console.error(error('Error:'), err instanceof Error ? err.message : String(err));
+        process.exit(1);
+    }
+});
+program
+    .command('knowledge')
+    .description('Query and manage preserved knowledge from codebase')
+    .argument('<action>', 'Action: query, list, summary, or extract')
+    .argument('[args...]', 'Arguments for the action')
+    .option('-c, --codebase <path>', 'Codebase path (default: current directory)')
+    .option('-t, --type <type>', 'Knowledge type filter (for list)')
+    .option('--tags <tags>', 'Comma-separated tags (for list)')
+    .option('-l, --limit <number>', 'Limit number of results', '10')
+    .action(async (action, args, options) => {
+    initLogFile();
+    try {
+        await executeKnowledgeCommand(action, args, {
+            codebase: options.codebase,
+            type: options.type,
+            tags: options.tags ? options.tags.split(',') : undefined,
+            limit: options.limit ? parseInt(options.limit, 10) : undefined,
+        });
+    }
+    catch (err) {
+        console.error(error('Error:'), err instanceof Error ? err.message : String(err));
+        process.exit(1);
+    }
+});
+program
+    .command('learning')
+    .description('Learning dashboard - View patterns, knowledge, and insights')
+    .argument('<action>', 'Action: overview, patterns, knowledge, or insights')
+    .option('-c, --codebase <path>', 'Codebase path (default: current directory)')
+    .action(async (action, options) => {
+    initLogFile();
+    try {
+        await executeLearningDashboardCommand(action, options.codebase);
     }
     catch (err) {
         console.error(error('Error:'), err instanceof Error ? err.message : String(err));
@@ -899,59 +899,110 @@ program
     }
 });
 program
-    .command('scaffold')
-    .description('Scaffold a simple app skeleton from a template')
-    .argument('<template>', 'Template name (e.g., node-api, next-page)')
-    .argument('<targetDir>', 'Target directory (relative to current directory)')
-    .action(async (template, targetDir) => {
+    .command('react')
+    .description('Execute query using ReAct loop (iterative reasoning with tools)')
+    .argument('<query>', 'The query to process with ReAct reasoning')
+    .addHelpText('after', `
+Examples:
+  $ codehere react "How does authentication work in this codebase?"
+  $ codehere react "Find and explain the user login function"
+  $ codehere react "What files handle API requests?"
+
+This command uses ReAct (Reasoning + Acting) pattern:
+  • Generates thoughts about the problem
+  • Takes actions (uses tools, searches code)
+  • Observes results
+  • Iterates until solution found
+  • Learns from memory of past experiences
+  `)
+    .action(async (query) => {
     initLogFile();
+    if (!process.env.COHERE_API_KEY) {
+        newline();
+        console.error(error('COHERE_API_KEY not found in environment'));
+        newline();
+        console.log(colors.bold('Setup Instructions:'));
+        console.log('  1. Get your API key from: https://dashboard.cohere.com/api-keys');
+        console.log('  2. Create a .env file in your project root:');
+        console.log(colors.cyan('     echo "COHERE_API_KEY=your_key_here" > .env'));
+        console.log('  3. Run the command again');
+        newline();
+        process.exit(1);
+    }
     try {
-        console.log(createBanner('Scaffold App', 'Create app skeleton from template'));
-        newline();
-        // List available templates if user asks
-        if (template === 'list' || template === '--list') {
-            const templates = listTemplates();
-            if (templates.length === 0) {
-                console.log(warning('No templates available.'));
-                return;
+        await executeReactCommand(query);
+        logEntry({
+            timestamp: new Date().toISOString(),
+            command: 'react',
+            query: query,
+            policyStatus: 'allowed',
+        });
+    }
+    catch (err) {
+        console.error(error('Error:'), err instanceof Error ? err.message : String(err));
+        process.exit(1);
+    }
+});
+program
+    .command('orchestrate')
+    .description('Orchestrate multi-agent workflows (plan, execute, validate)')
+    .argument('<goal>', 'The goal to orchestrate')
+    .option('-m, --mode <mode>', 'Orchestration mode: plan-only, execute-only, or full', 'full')
+    .option('-p, --plan-id <planId>', 'Load and execute a previously saved plan by ID')
+    .action(async (goal, options) => {
+    initLogFile();
+    if (!process.env.COHERE_API_KEY) {
+        newline();
+        console.error(error('COHERE_API_KEY not found in environment'));
+        process.exit(1);
+    }
+    try {
+        await executeOrchestrateCommand(goal, {
+            mode: options.mode,
+            planId: options.planId,
+        });
+        logEntry({
+            timestamp: new Date().toISOString(),
+            command: 'orchestrate',
+            query: goal,
+            policyStatus: 'allowed',
+        });
+    }
+    catch (err) {
+        console.error(error('Error:'), err instanceof Error ? err.message : String(err));
+        process.exit(1);
+    }
+});
+program
+    .command('trace')
+    .description('View execution traces and reproduce runs')
+    .argument('<action>', 'Action: list, show, or reproduce')
+    .argument('[runId]', 'Run ID (required for show/reproduce)')
+    .action(async (action, runId) => {
+    initLogFile();
+    try {
+        if (action === 'list') {
+            await executeTraceCommand('list');
+        }
+        else if (action === 'show') {
+            if (!runId) {
+                console.error(error('Run ID is required for "show" action'));
+                console.log(info('Usage: codehere trace show <runId>'));
+                process.exit(1);
             }
-            sectionHeader('Available Templates');
-            templates.forEach(t => {
-                console.log(colors.cyan(`  ${t}`));
-            });
-            newline();
-            return;
+            await executeTraceCommand('show', runId);
         }
-        console.log(colors.bold('Template:') + ' ' + colors.cyan(template));
-        console.log(colors.bold('Target:') + ' ' + colors.cyan(targetDir));
-        newline();
-        const result = scaffoldTemplate(template, targetDir);
-        if (result.success) {
-            sectionHeader('Files Created');
-            result.filesCreated.forEach(file => {
-                console.log(colors.green('  ✓ ') + file);
-            });
-            newline();
-            console.log(success(`Scaffold complete! Created ${result.filesCreated.length} file(s).`));
-            newline();
-            console.log(info('Next steps:'));
-            console.log(colors.dim(`  1. cd ${targetDir}`));
-            console.log(colors.dim(`  2. codehere index`));
-            console.log(colors.dim(`  3. codehere explain <file>`));
-            console.log(colors.dim(`  4. codehere fix <file> "<instruction>"`));
-            newline();
-            logEntry({
-                timestamp: new Date().toISOString(),
-                command: 'scaffold',
-                query: `${template} -> ${targetDir}`,
-                policyStatus: 'allowed',
-            });
+        else if (action === 'reproduce') {
+            if (!runId) {
+                console.error(error('Run ID is required for "reproduce" action'));
+                console.log(info('Usage: codehere trace reproduce <runId>'));
+                process.exit(1);
+            }
+            await executeTraceCommand('reproduce', runId);
         }
         else {
-            newline();
-            console.error(error('Scaffold failed'));
-            console.log(colors.red('  ' + (result.error || 'Unknown error')));
-            newline();
+            console.error(error(`Unknown action: ${action}`));
+            console.log(info('Available actions: list, show, reproduce'));
             process.exit(1);
         }
     }
@@ -960,5 +1011,70 @@ program
         process.exit(1);
     }
 });
+program
+    .command('undo')
+    .description('Undo file changes by restoring from backups')
+    .argument('<action>', 'Action: undo, list, restore')
+    .argument('[filepath]', 'File path (required for undo/list)')
+    .argument('[backupPath]', 'Backup path (required for restore)')
+    .addHelpText('after', `
+Examples:
+  $ codehere undo undo src/file.ts
+  $ codehere undo list src/file.ts
+  $ codehere undo restore src/file.ts .codehere/backups/file.ts.2024-12-30.backup
+
+Actions:
+  undo    - Restore file from most recent backup
+  list    - List all available backups for a file
+  restore - Restore file from a specific backup path
+  `)
+    .action(async (action, filepath, backupPath) => {
+    initLogFile();
+    try {
+        await executeUndoCommand(action, filepath, backupPath);
+    }
+    catch (err) {
+        console.error(error('Error:'), err instanceof Error ? err.message : String(err));
+        process.exit(1);
+    }
+});
+// Add completion command
+program
+    .command('completion')
+    .description('Generate shell completion script')
+    .argument('<shell>', 'Shell type: bash, zsh, or fish')
+    .action(async (shell) => {
+    try {
+        switch (shell.toLowerCase()) {
+            case 'bash': {
+                const { generateBashCompletion } = await import('./infrastructure/completion/bash-completion.js');
+                console.log(generateBashCompletion());
+                break;
+            }
+            case 'zsh': {
+                const { generateZshCompletion } = await import('./infrastructure/completion/zsh-completion.js');
+                console.log(generateZshCompletion());
+                break;
+            }
+            case 'fish': {
+                const { generateFishCompletion } = await import('./infrastructure/completion/fish-completion.js');
+                console.log(generateFishCompletion());
+                break;
+            }
+            default:
+                console.error(error(`Unsupported shell: ${shell}`));
+                console.log(info('Supported shells: bash, zsh, fish'));
+                console.log(info('Usage: codehere completion <bash|zsh|fish>'));
+                process.exit(1);
+        }
+    }
+    catch (err) {
+        displayError(err, {
+            operation: 'completion',
+            showSuggestions: true,
+        });
+        process.exit(1);
+    }
+});
 program.parse();
 //# sourceMappingURL=index.js.map