docrev 0.9.4 → 0.9.6

package/lib/commands/sections.ts

@@ -1,25 +1,19 @@
 /**
- * Section commands: import, extract, split, sync, merge
+ * Section commands: import, extract, split
  *
- * Commands for importing Word documents, splitting/syncing section files.
+ * Commands for importing Word documents and splitting section files.
+ * Sync and merge commands are in sync.ts and merge-resolve.ts respectively.
  */
 
 import {
   chalk,
   fs,
   path,
-  fmt,
-  findFiles,
   countAnnotations,
   loadConfig,
-  extractSectionsFromText,
   splitAnnotatedPaper,
-  buildRegistry,
-  convertHardcodedRefs,
-  inlineDiffPreview,
 } from './context.js';
 import type { Command } from 'commander';
-import * as readline from 'readline';
 
 interface DetectedSection {
   header: string;
@@ -56,25 +50,6 @@ interface SplitOptions {
   dryRun?: boolean;
 }
 
-interface SyncOptions {
-  config: string;
-  dir: string;
-  crossref?: boolean;
-  diff?: boolean;
-  force?: boolean;
-  dryRun?: boolean;
-}
-
-interface MergeOptions {
-  base?: string;
-  output?: string;
-  names?: string;
-  strategy: string;
-  diffLevel: 'sentence' | 'word';
-  dryRun?: boolean;
-  sections?: boolean;
-}
-
 /**
  * Detect sections from Word document text
  * Looks for common academic paper section headers
@@ -473,833 +448,4 @@ export function register(program: Command): void {
         console.log(chalk.cyan('\nNext: rev review <section.md> for each section'));
       }
     });
-
-  // ==========================================================================
-  // SYNC command - Import with section awareness
-  // ==========================================================================
-
-  program
-    .command('sync')
-    .alias('sections')
-    .description('Sync feedback from Word/PDF back to section files')
-    .argument('[file]', 'Word (.docx) or PDF file from reviewer (default: most recent)')
-    .argument('[sections...]', 'Specific sections to sync (default: all)')
-    .option('-c, --config <file>', 'Sections config file', 'sections.yaml')
-    .option('-d, --dir <directory>', 'Directory with section files', '.')
-    .option('--no-crossref', 'Skip converting hardcoded figure/table refs')
-    .option('--no-diff', 'Skip showing diff preview')
-    .option('--force', 'Overwrite files without conflict warning')
-    .option('--dry-run', 'Preview without writing files')
-    .action(async (docx: string | undefined, sections: string[], options: SyncOptions) => {
-      // Auto-detect most recent docx or pdf if not provided
-      if (!docx) {
-        const docxFiles = findFiles('.docx');
-        const pdfFiles = findFiles('.pdf');
-        const allFiles = [...docxFiles, ...pdfFiles];
-
-        if (allFiles.length === 0) {
-          console.error(fmt.status('error', 'No .docx or .pdf files found in current directory.'));
-          process.exit(1);
-        }
-        const sorted = allFiles
-          .map(f => ({ name: f, mtime: fs.statSync(f).mtime }))
-          .sort((a, b) => b.mtime.getTime() - a.mtime.getTime());
-        docx = sorted[0].name;
-        console.log(fmt.status('info', `Using most recent: ${docx}`));
-        console.log();
-      }
-
-      if (!fs.existsSync(docx)) {
-        console.error(fmt.status('error', `File not found: ${docx}`));
-        process.exit(1);
-      }
-
-      // Handle PDF files
-      if (docx.toLowerCase().endsWith('.pdf')) {
-        const { extractPdfComments, formatPdfComments, getPdfCommentStats } = await import('../pdf-import.js');
-
-        const spin = fmt.spinner(`Extracting comments from ${path.basename(docx)}...`).start();
-
-        try {
-          const comments = await extractPdfComments(docx);
-          spin.stop();
-
-          if (comments.length === 0) {
-            console.log(fmt.status('info', 'No comments found in PDF.'));
-            return;
-          }
-
-          const stats = getPdfCommentStats(comments);
-          console.log(fmt.header(`PDF Comments from ${path.basename(docx)}`));
-          console.log();
-          console.log(formatPdfComments(comments));
-          console.log();
-
-          const authorList = Object.entries(stats.byAuthor)
-            .map(([author, count]) => `${author} (${count})`)
-            .join(', ');
-          console.log(chalk.dim(`Total: ${stats.total} comments from ${authorList}`));
-          console.log();
-
-          const configPath = path.resolve(options.dir, options.config);
-          if (fs.existsSync(configPath) && !options.dryRun) {
-            const config = loadConfig(configPath);
-            const mainSection = config.sections?.[0];
-
-            if (mainSection && typeof mainSection === 'string') {
-              const mainPath = path.join(options.dir, mainSection);
-              if (fs.existsSync(mainPath)) {
-                console.log(chalk.dim(`Use 'rev pdf-comments ${docx} --append ${mainSection}' to add comments to markdown.`));
-              }
-            }
-          }
-        } catch (err) {
-          spin.stop();
-          const error = err as Error;
-          console.error(fmt.status('error', `Failed to extract PDF comments: ${error.message}`));
-          if (process.env.DEBUG) console.error(error.stack);
-          process.exit(1);
-        }
-        return;
-      }
-
-      const configPath = path.resolve(options.dir, options.config);
-      if (!fs.existsSync(configPath)) {
-        console.error(fmt.status('error', `Config not found: ${configPath}`));
-        console.error(chalk.dim('  Run "rev init" first to generate sections.yaml'));
-        process.exit(1);
-      }
-
-      // Check pandoc availability upfront and warn
-      const { hasPandoc, getInstallInstructions } = await import('../dependencies.js');
-      if (!hasPandoc()) {
-        console.log(fmt.status('warning', `Pandoc not installed. Track changes will be extracted from XML (formatting may differ).`));
-        console.log(chalk.dim(`  Install for best results: ${getInstallInstructions('pandoc')}`));
-        console.log();
-      }
-
-      const spin = fmt.spinner(`Importing ${path.basename(docx)}...`).start();
-
-      try {
-        const config = loadConfig(configPath);
-        const { importFromWord, extractWordComments, extractCommentAnchors, insertCommentsIntoMarkdown, extractFromWord } = await import('../import.js');
-
-        let registry = null;
-        let totalRefConversions = 0;
-        if (options.crossref !== false) {
-          registry = buildRegistry(options.dir);
-        }
-
-        const comments = await extractWordComments(docx);
-        const { anchors, fullDocText: xmlDocText } = await extractCommentAnchors(docx);
-
-        // Extract Word text (uses pandoc if available, falls back to XML extraction)
-        const wordExtraction = await extractFromWord(docx, { mediaDir: options.dir });
-        let wordText = wordExtraction.text;
-        const wordTables = wordExtraction.tables || [];
-
-        // Log extraction messages (warnings about pandoc, track change stats, etc.)
-        for (const msg of wordExtraction.messages || []) {
-          if (msg.type === 'warning') {
-            spin.stop();
-            console.log(fmt.status('warning', msg.message));
-            spin.start();
-          }
-        }
-
-        // Restore crossref on FULL text BEFORE splitting into sections
-        // This ensures duplicate labels from track changes are handled correctly
-        // (the same figure may appear multiple times in old/new versions)
-        const { restoreCrossrefFromWord, restoreImagesFromRegistry } = await import('../import.js');
-        const crossrefResult = restoreCrossrefFromWord(wordText, options.dir);
-        wordText = crossrefResult.text;
-        if (crossrefResult.restored > 0) {
-          console.log(`Restored ${crossrefResult.restored} crossref reference(s)`);
-        }
-
-        // Also restore images from registry using shared restoredLabels
-        const imageRestoreResult = restoreImagesFromRegistry(wordText, options.dir, crossrefResult.restoredLabels);
-        wordText = imageRestoreResult.text;
-        if (imageRestoreResult.restored > 0) {
-          console.log(`Restored ${imageRestoreResult.restored} image(s) from registry`);
-        }
-
-        let wordSections = extractSectionsFromText(wordText, config.sections);
-
-        if (wordSections.length === 0) {
-          spin.stop();
-          console.error(fmt.status('warning', 'No sections detected in Word document.'));
-          console.error(chalk.dim('  Check that headings match sections.yaml'));
-          process.exit(1);
-        }
-
-        if (sections && sections.length > 0) {
-          const onlyList = sections.map(s => s.trim().toLowerCase());
-          wordSections = wordSections.filter(section => {
-            const fileName = section.file.replace(/\.md$/i, '').toLowerCase();
-            const header = section.header.toLowerCase();
-            return onlyList.some(name => fileName === name || fileName.includes(name) || header.includes(name));
-          });
-          if (wordSections.length === 0) {
-            spin.stop();
-            console.error(fmt.status('error', `No sections matched: ${sections.join(', ')}`));
-            console.error(chalk.dim(`  Available: ${extractSectionsFromText(wordText, config.sections).map(s => s.file.replace(/\.md$/i, '')).join(', ')}`));
-            process.exit(1);
-          }
-        }
-
-        spin.stop();
-        console.log(fmt.header(`Import from ${path.basename(docx)}`));
-        console.log();
-
-        // Conflict detection
-        if (!options.force && !options.dryRun) {
-          const conflicts: Array<{ file: string; annotations: number }> = [];
-          for (const section of wordSections) {
-            const sectionPath = path.join(options.dir, section.file);
-            if (fs.existsSync(sectionPath)) {
-              const existing = fs.readFileSync(sectionPath, 'utf-8');
-              const existingCounts = countAnnotations(existing);
-              if (existingCounts.total > 0) {
-                conflicts.push({
-                  file: section.file,
-                  annotations: existingCounts.total,
-                });
-              }
-            }
-          }
-
-          if (conflicts.length > 0) {
-            console.log(fmt.status('warning', 'Files with existing annotations will be overwritten:'));
-            for (const c of conflicts) {
-              console.log(chalk.yellow(`  - ${c.file} (${c.annotations} annotations)`));
-            }
-            console.log();
-
-            const rl = readline.createInterface({
-              input: process.stdin,
-              output: process.stdout,
-            });
-
-            const answer = await new Promise<string>((resolve) =>
-              rl.question(chalk.cyan('Continue and overwrite? [y/N] '), resolve)
-            );
-            rl.close();
-
-            if (answer.toLowerCase() !== 'y') {
-              console.log(chalk.dim('Aborted. Use --force to skip this check.'));
-              process.exit(0);
-            }
-            console.log();
-          }
-        }
-
-        const sectionResults: Array<{
-          file: string;
-          header: string;
-          status: string;
-          stats?: ImportStats;
-          refs?: number;
-        }> = [];
-        let totalChanges = 0;
-
-        // Calculate section boundaries in the XML document text for comment filtering
-        // Comment positions (docPosition) are relative to xmlDocText, NOT wordText
-        // So we must find section headers in xmlDocText to get matching boundaries
-        const sectionBoundaries: Array<{ file: string; start: number; end: number }> = [];
-        const xmlLower = xmlDocText.toLowerCase();
-
-        // Standard section header keywords to search for in XML
-        // Map from file name pattern to search terms
-        const sectionKeywords: Record<string, string[]> = {
-          'abstract': ['abstract', 'summary'],
-          'introduction': ['introduction', 'background'],
-          'methods': ['methods', 'materials and methods', 'methodology'],
-          'results': ['results'],
-          'discussion': ['discussion'],
-          'conclusion': ['conclusion', 'conclusions'],
-        };
-
-        // Helper: find section header (skip labels like "Methods:" in structured abstracts)
-        // Real section headers are NOT followed by ":" immediately
-        function findSectionHeader(text: string, keyword: string, startFrom: number = 0): number {
-          const lower = text.toLowerCase();
-          let idx = startFrom;
-          while ((idx = lower.indexOf(keyword, idx)) !== -1) {
-            // Check what follows the keyword
-            const afterKeyword = text.slice(idx + keyword.length, idx + keyword.length + 5);
-            // Skip if followed by ":" (this is a label, not a section header)
-            // Real headers are followed by text content, a newline, or a subheading
-            if (!afterKeyword.startsWith(':') && !afterKeyword.startsWith(' :')) {
-              return idx;
-            }
-            idx++;
-          }
-          return -1;
-        }
-
-        for (const section of wordSections) {
-          const fileBase = section.file.replace(/\.md$/i, '').toLowerCase();
-
-          // Get keywords for this section
-          const keywords = sectionKeywords[fileBase] || [fileBase];
-
-          // Find the first valid keyword that exists in XML (not a label)
-          let headerIdx = -1;
-          for (const kw of keywords) {
-            const idx = findSectionHeader(xmlDocText, kw, 0);
-            if (idx >= 0 && (headerIdx < 0 || idx < headerIdx)) {
-              headerIdx = idx;
-            }
-          }
-
-          if (headerIdx >= 0) {
-            // Find the next section's start to determine end boundary
-            let nextHeaderIdx = xmlDocText.length;
-            const sectionIdx = wordSections.indexOf(section);
-            if (sectionIdx < wordSections.length - 1) {
-              const nextFileBase = wordSections[sectionIdx + 1].file.replace(/\.md$/i, '').toLowerCase();
-              const nextKeywords = sectionKeywords[nextFileBase] || [nextFileBase];
-              for (const nkw of nextKeywords) {
-                const foundNext = findSectionHeader(xmlDocText, nkw, headerIdx + 10);
-                if (foundNext >= 0 && foundNext < nextHeaderIdx) {
-                  nextHeaderIdx = foundNext;
-                }
-              }
-            }
-
-            sectionBoundaries.push({
-              file: section.file,
-              start: headerIdx,
-              end: nextHeaderIdx
-            });
-
-          }
-        }
-
-        // Document length is the XML text length (same coordinate system as docPosition)
-        const docLength = xmlDocText.length;
-
-        for (const section of wordSections) {
-          const sectionPath = path.join(options.dir, section.file);
-
-          if (!fs.existsSync(sectionPath)) {
-            sectionResults.push({
-              file: section.file,
-              header: section.header,
-              status: 'skipped',
-              stats: undefined,
-            });
-            continue;
-          }
-
-          const result = await importFromWord(docx, sectionPath, {
-            sectionContent: section.content,
-            author: 'Reviewer',
-            wordTables: wordTables,
-          });
-
-          let { annotated, stats } = result;
-
-          let refConversions: Array<{ from: string; to: string }> = [];
-          if (registry && options.crossref !== false) {
-            const crossrefResult = convertHardcodedRefs(annotated, registry);
-            annotated = crossrefResult.converted;
-            refConversions = crossrefResult.conversions;
-            totalRefConversions += refConversions.length;
-          }
-
-          let commentsInserted = 0;
-          if (comments.length > 0 && anchors.size > 0) {
-            // Filter comments to only those that belong to this section
-            // Use exact position matching: docPosition is in xmlDocText coordinates,
-            // and sectionBoundaries are also in xmlDocText coordinates (same source!)
-            const boundary = sectionBoundaries.find(b => b.file === section.file);
-            const isFirstSection = wordSections.indexOf(section) === 0;
-            const firstBoundaryStart = sectionBoundaries.length > 0 ? Math.min(...sectionBoundaries.map(b => b.start)) : 0;
-
-            const sectionComments = comments.filter((c: any) => {
-              const anchorData = anchors.get(c.id);
-              if (!anchorData) return false;
-
-              // Use exact position - no scaling needed since both are in xmlDocText coordinates
-              if (anchorData.docPosition !== undefined && boundary) {
-                // Include comments within section boundaries
-                if (anchorData.docPosition >= boundary.start && anchorData.docPosition < boundary.end) {
-                  return true;
-                }
-                // Also include "outside" comments (before first section) in the first section file
-                if (isFirstSection && anchorData.docPosition < firstBoundaryStart) {
-                  return true;
-                }
-              }
-
-              return false;
-            });
-
-            if (process.env.DEBUG) {
-              console.log(`[DEBUG] ${section.file}: ${sectionComments.length} comments to place (boundary: ${boundary?.start}-${boundary?.end})`);
-            }
-
-            if (sectionComments.length > 0) {
-              // Use a more robust pattern that handles < in comment text
-              const commentPattern = /\{>>.*?<<\}/gs;
-              const beforeCount = (annotated.match(commentPattern) || []).length;
-              annotated = insertCommentsIntoMarkdown(annotated, sectionComments, anchors, {
-                quiet: !process.env.DEBUG,
-                sectionBoundary: boundary  // Pass section boundary for position-based insertion
-              });
-              const afterCount = (annotated.match(commentPattern) || []).length;
-              commentsInserted = afterCount - beforeCount;
-
-              if (process.env.DEBUG) {
-                console.log(`[DEBUG] ${section.file}: inserted ${commentsInserted} of ${sectionComments.length} comments`);
-              }
-
-              if (commentsInserted > 0) {
-                stats.comments = (stats.comments || 0) + commentsInserted;
-              }
-            }
-          }
-
-          totalChanges += stats.total;
-
-          sectionResults.push({
-            file: section.file,
-            header: section.header,
-            status: 'ok',
-            stats,
-            refs: refConversions.length,
-          });
-
-          if (!options.dryRun) {
-            fs.writeFileSync(sectionPath, annotated, 'utf-8');
-          }
-        }
-
-        const tableRows = sectionResults.map((r) => {
-          if (r.status === 'skipped') {
-            return [
-              chalk.dim(r.file),
-              chalk.dim(r.header.slice(0, 25)),
-              chalk.yellow('skipped'),
-              '',
-              '',
-              '',
-              '',
-            ];
-          }
-          const s = r.stats!;
-          return [
-            chalk.bold(r.file),
-            r.header.length > 25 ? r.header.slice(0, 22) + '...' : r.header,
-            s.insertions > 0 ? chalk.green(`+${s.insertions}`) : chalk.dim('-'),
-            s.deletions > 0 ? chalk.red(`-${s.deletions}`) : chalk.dim('-'),
-            s.substitutions > 0 ? chalk.yellow(`~${s.substitutions}`) : chalk.dim('-'),
-            s.comments > 0 ? chalk.blue(`#${s.comments}`) : chalk.dim('-'),
-            r.refs! > 0 ? chalk.magenta(`@${r.refs}`) : chalk.dim('-'),
-          ];
-        });
-
-        console.log(fmt.table(
-          ['File', 'Section', 'Ins', 'Del', 'Sub', 'Cmt', 'Ref'],
-          tableRows,
-          { align: ['left', 'left', 'right', 'right', 'right', 'right', 'right'] }
-        ));
-        console.log();
-
-        if (options.diff !== false && totalChanges > 0) {
-          console.log(fmt.header('Changes Preview'));
-          console.log();
-          for (const result of sectionResults) {
-            if (result.status === 'ok' && result.stats && result.stats.total > 0) {
-              const sectionPath = path.join(options.dir, result.file);
-              if (fs.existsSync(sectionPath)) {
-                const content = fs.readFileSync(sectionPath, 'utf-8');
-                const preview = inlineDiffPreview(content, { maxLines: 3 });
-                if (preview) {
-                  console.log(chalk.bold(result.file) + ':');
-                  console.log(preview);
-                  console.log();
-                }
-              }
-            }
-          }
-        }
-
-        if (options.dryRun) {
-          console.log(fmt.box(chalk.yellow('Dry run - no files written'), { padding: 0 }));
-        } else if (totalChanges > 0 || totalRefConversions > 0 || comments.length > 0) {
-          const summaryLines: string[] = [];
-          summaryLines.push(`${chalk.bold(wordSections.length)} sections processed`);
-          if (totalChanges > 0) summaryLines.push(`${chalk.bold(totalChanges)} annotations imported`);
-          if (comments.length > 0) summaryLines.push(`${chalk.bold(comments.length)} comments placed`);
-          if (totalRefConversions > 0) summaryLines.push(`${chalk.bold(totalRefConversions)} refs converted to @-syntax`);
-
-          console.log(fmt.box(summaryLines.join('\n'), { title: 'Summary', padding: 0 }));
-          console.log();
-          console.log(chalk.dim('Next steps:'));
-          console.log(chalk.dim('  1. rev review <section.md>  - Accept/reject changes'));
-          console.log(chalk.dim('  2. rev comments <section.md> - View/address comments'));
-          console.log(chalk.dim('  3. rev build docx  - Rebuild Word doc'));
-        } else {
-          console.log(fmt.status('success', 'No changes detected.'));
-        }
-      } catch (err) {
-        spin.stop();
-        const error = err as Error;
-        console.error(fmt.status('error', error.message));
-        if (process.env.DEBUG) console.error(error.stack);
-        process.exit(1);
-      }
-    });
-
-  // ==========================================================================
-  // MERGE command - Combine feedback from multiple reviewers (three-way merge)
-  // ==========================================================================
-
-  program
-    .command('merge')
-    .description('Merge feedback from multiple Word documents using three-way merge')
-    .argument('<docx...>', 'Word documents from reviewers')
-    .option('-b, --base <file>', 'Base document (original sent to reviewers). Auto-detected if not specified.')
-    .option('-o, --output <file>', 'Output file (default: writes to section files)')
-    .option('--names <names>', 'Reviewer names (comma-separated, in order of docx files)')
-    .option('--strategy <strategy>', 'Conflict resolution: first, latest, or interactive (default)', 'interactive')
-    .option('--diff-level <level>', 'Diff granularity: sentence or word (default: sentence)', 'sentence')
-    .option('--dry-run', 'Show conflicts without writing')
-    .option('--sections', 'Split merged output back to section files')
-    .action(async (docxFiles: string[], options: MergeOptions) => {
-      const {
-        mergeThreeWay,
-        formatConflict,
-        resolveConflict,
-        getBaseDocument,
-        checkBaseMatch,
-        saveConflicts,
-      } = await import('../merge.js');
-
-      // Validate reviewer files exist
-      for (const docx of docxFiles) {
-        if (!fs.existsSync(docx)) {
-          console.error(fmt.status('error', `Reviewer file not found: ${docx}`));
-          process.exit(1);
-        }
-      }
-
-      // Determine base document
-      let basePath = options.base;
-      let baseSource = 'specified';
-
-      if (!basePath) {
-        // Try to use .rev/base.docx
-        const projectDir = process.cwd();
-        basePath = getBaseDocument(projectDir) ?? undefined;
-
-        if (basePath) {
-          baseSource = 'auto (.rev/base.docx)';
-        } else {
-          console.log(chalk.yellow('\n  No base document found in .rev/base.docx'));
-          console.log(chalk.dim('  Tip: Run "rev build docx" to automatically save the base document.\n'));
-          console.error(fmt.status('error', 'Base document required. Use --base <file.docx>'));
-          process.exit(1);
-        }
-      }
-
-      if (!fs.existsSync(basePath)) {
-        console.error(fmt.status('error', `Base document not found: ${basePath}`));
-        process.exit(1);
-      }
-
-      // Check similarity between base and reviewer docs
-      const { matches, similarity } = await checkBaseMatch(basePath, docxFiles[0]);
-      if (!matches) {
-        console.log(chalk.yellow(`\n  Warning: Base document may not match reviewer file (${Math.round(similarity * 100)}% similar)`));
-        console.log(chalk.dim('  If this is wrong, use --base to specify the correct original document.\n'));
-      }
-
-      // Parse reviewer names
-      const names = options.names
-        ? options.names.split(',').map(n => n.trim())
-        : docxFiles.map((f, i) => {
-          // Try to extract name from filename (e.g., paper_reviewer_A.docx)
-          const basename = path.basename(f, '.docx');
-          const match = basename.match(/_([A-Za-z]+)$/);
-          return match ? match[1] : `Reviewer ${i + 1}`;
-        });
-
-      // Pad names if needed
-      while (names.length < docxFiles.length) {
-        names.push(`Reviewer ${names.length + 1}`);
-      }
-
-      const reviewerDocs = docxFiles.map((p, i) => ({
-        path: p,
-        name: names[i],
-      }));
-
-      console.log(fmt.header('Three-Way Merge'));
-      console.log();
-      console.log(chalk.dim(`  Base: ${path.basename(basePath)} (${baseSource})`));
-      console.log(chalk.dim(`  Reviewers: ${names.join(', ')}`));
-      console.log(chalk.dim(`  Diff level: ${options.diffLevel}`));
-      console.log();
-
-      const spin = fmt.spinner('Analyzing changes...').start();
-
-      try {
-        const { merged, conflicts, stats, baseText } = await mergeThreeWay(basePath, reviewerDocs, {
-          diffLevel: options.diffLevel,
-        });
-
-        spin.stop();
-
-        // Display stats
-        console.log(fmt.table(['Metric', 'Count'], [
-          ['Total changes', stats.totalChanges.toString()],
-          ['Non-conflicting', stats.nonConflicting.toString()],
-          ['Conflicts', stats.conflicts.toString()],
-          ['Comments', stats.comments.toString()],
-        ]));
-        console.log();
-
-        let finalMerged = merged;
-
-        // Handle conflicts
-        if (conflicts.length > 0) {
-          console.log(chalk.yellow(`Found ${conflicts.length} conflict(s):\n`));
-
-          if (options.strategy === 'first') {
-            // Auto-resolve: take first reviewer's change
-            for (const conflict of conflicts) {
-              console.log(chalk.dim(`  Conflict ${conflict.id}: using ${conflict.changes[0].reviewer}'s change`));
-              resolveConflict(conflict, 0);
-            }
-          } else if (options.strategy === 'latest') {
-            // Auto-resolve: take last reviewer's change
-            for (const conflict of conflicts) {
-              const lastIdx = conflict.changes.length - 1;
-              console.log(chalk.dim(`  Conflict ${conflict.id}: using ${conflict.changes[lastIdx].reviewer}'s change`));
-              resolveConflict(conflict, lastIdx);
-            }
-          } else if (!options.dryRun) {
-            // Interactive resolution
-            for (let i = 0; i < conflicts.length; i++) {
-              const conflict = conflicts[i];
-              console.log(chalk.bold(`\nConflict ${i + 1}/${conflicts.length} (${conflict.id}):`));
-              console.log(formatConflict(conflict, baseText));
-              console.log();
-
-              const rl = readline.createInterface({
-                input: process.stdin,
-                output: process.stdout,
-              });
-
-              const answer = await new Promise<string>((resolve) =>
-                rl.question(chalk.cyan(`  Choose (1-${conflict.changes.length}, s=skip): `), resolve)
-              );
-              rl.close();
-
-              if (answer.toLowerCase() !== 's' && !isNaN(parseInt(answer))) {
-                const choice = parseInt(answer) - 1;
-                if (choice >= 0 && choice < conflict.changes.length) {
-                  resolveConflict(conflict, choice);
-                  console.log(chalk.green(`  ✓ Applied: ${conflict.changes[choice].reviewer}'s change`));
-                }
-              } else {
-                console.log(chalk.dim('  Skipped (will need manual resolution)'));
-              }
-            }
-          }
-
-          // Save unresolved conflicts for later
-          const unresolved = conflicts.filter(c => c.resolved === null);
-          if (unresolved.length > 0) {
-            saveConflicts(process.cwd(), conflicts, basePath);
-            console.log(chalk.yellow(`\n  ${unresolved.length} unresolved conflict(s) saved to .rev/conflicts.json`));
-            console.log(chalk.dim('  Run "rev conflicts" to view, "rev merge-resolve" to resolve'));
-          }
-        }
-
-        // Write output
-        if (!options.dryRun) {
-          if (options.output) {
-            // Write to single file
-            fs.writeFileSync(options.output, finalMerged, 'utf-8');
-            console.log(fmt.status('success', `Merged output written to ${options.output}`));
-          } else if (options.sections) {
-            // Split to section files (TODO: implement section splitting)
-            console.log(chalk.yellow('  Section splitting not yet implemented'));
-            console.log(chalk.dim('  Use -o to specify output file'));
-          } else {
-            // Default: write to merged.md
-            const outPath = 'merged.md';
-            fs.writeFileSync(outPath, finalMerged, 'utf-8');
-            console.log(fmt.status('success', `Merged output written to ${outPath}`));
-          }
-
-          console.log();
-          console.log(chalk.dim('Next steps:'));
-          console.log(chalk.dim('  1. rev review merged.md     - Accept/reject changes'));
-          console.log(chalk.dim('  2. rev comments merged.md   - Address comments'));
-          if (conflicts.some(c => c.resolved === null)) {
-            console.log(chalk.dim('  3. rev merge-resolve        - Resolve remaining conflicts'));
-          }
-        } else {
-          console.log(fmt.status('info', 'Dry run - no output written'));
-        }
-      } catch (err) {
-        spin.stop();
-        const error = err as Error;
-        console.error(fmt.status('error', error.message));
-        if (process.env.DEBUG) console.error(error.stack);
-        process.exit(1);
-      }
-    });
-
-  // ==========================================================================
-  // CONFLICTS command - List unresolved conflicts
-  // ==========================================================================
-
-  program
-    .command('conflicts')
-    .description('List unresolved merge conflicts')
-    .action(async () => {
-      const { loadConflicts, formatConflict } = await import('../merge.js');
-      const projectDir = process.cwd();
-      const data = loadConflicts(projectDir);
-
-      if (!data) {
-        console.log(fmt.status('info', 'No conflicts file found'));
-        return;
-      }
-
-      const unresolved = data.conflicts.filter((c: any) => c.resolved === null);
-
-      if (unresolved.length === 0) {
-        console.log(fmt.status('success', 'All conflicts resolved!'));
-        return;
-      }
-
-      console.log(fmt.header(`Unresolved Conflicts (${unresolved.length})`));
-      console.log();
-      console.log(chalk.dim(`  Base: ${data.base}`));
-      console.log(chalk.dim(`  Merged: ${data.merged}`));
-      console.log();
-
-      for (const conflict of unresolved) {
-        console.log(chalk.bold(`Conflict ${conflict.id}:`));
-        // Show abbreviated info
-        console.log(chalk.dim(`  Original: "${conflict.original.slice(0, 50)}${conflict.original.length > 50 ? '...' : ''}"`));
-        console.log(chalk.dim(`  Options: ${conflict.changes.map((c: any) => c.reviewer).join(', ')}`));
-        console.log();
-      }
-
-      console.log(chalk.dim('Run "rev merge-resolve" to resolve conflicts interactively'));
-    });
-
-  // ==========================================================================
-  // MERGE-RESOLVE command - Interactively resolve merge conflicts
-  // ==========================================================================
-
-  program
-    .command('merge-resolve')
-    .alias('mresolve')
-    .description('Resolve merge conflicts interactively')
-    .option('--theirs', 'Accept all changes from last reviewer')
-    .option('--ours', 'Accept all changes from first reviewer')
-    .action(async (options: { theirs?: boolean; ours?: boolean }) => {
-      const { loadConflicts, saveConflicts, clearConflicts, resolveConflict, formatConflict } = await import('../merge.js');
-      const projectDir = process.cwd();
-      const data = loadConflicts(projectDir);
-
-      if (!data) {
-        console.log(fmt.status('info', 'No conflicts to resolve'));
-        return;
-      }
-
-      const unresolved = data.conflicts.filter((c: any) => c.resolved === null);
-
-      if (unresolved.length === 0) {
-        console.log(fmt.status('success', 'All conflicts already resolved!'));
-        clearConflicts(projectDir);
-        return;
-      }
-
-      console.log(fmt.header(`Resolving ${unresolved.length} Conflict(s)`));
-      console.log();
-
-      if (options.theirs) {
-        // Accept all from last reviewer
-        for (const conflict of unresolved) {
-          const lastIdx = conflict.changes.length - 1;
-          resolveConflict(conflict, lastIdx);
-          console.log(chalk.dim(`  ${conflict.id}: accepted ${conflict.changes[lastIdx].reviewer}'s change`));
-        }
-        saveConflicts(projectDir, data.conflicts, data.base);
-        console.log(fmt.status('success', `Resolved ${unresolved.length} conflicts (--theirs)`));
-      } else if (options.ours) {
-        // Accept all from first reviewer
-        for (const conflict of unresolved) {
-          resolveConflict(conflict, 0);
-          console.log(chalk.dim(`  ${conflict.id}: accepted ${conflict.changes[0].reviewer}'s change`));
-        }
-        saveConflicts(projectDir, data.conflicts, data.base);
-        console.log(fmt.status('success', `Resolved ${unresolved.length} conflicts (--ours)`));
-      } else {
-        // Interactive resolution
-        // Read base text for context display
-        let baseText = '';
-        try {
-          const { extractFromWord } = await import('../import.js');
-          const { text } = await extractFromWord(data.base);
-          baseText = text;
-        } catch {
-          // Can't read base, show without context
-        }
-
-        for (let i = 0; i < unresolved.length; i++) {
-          const conflict = unresolved[i];
-          console.log(chalk.bold(`\nConflict ${i + 1}/${unresolved.length} (${conflict.id}):`));
-          console.log(formatConflict(conflict, baseText));
-          console.log();
-
-          const rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-          });
-
-          const answer = await new Promise<string>((resolve) =>
-            rl.question(chalk.cyan(`  Choose (1-${conflict.changes.length}, s=skip, q=quit): `), resolve)
-          );
-          rl.close();
-
-          if (answer.toLowerCase() === 'q') {
-            console.log(chalk.dim('\n  Saving progress...'));
-            break;
-          }
-
-          if (answer.toLowerCase() !== 's' && !isNaN(parseInt(answer))) {
-            const choice = parseInt(answer) - 1;
-            if (choice >= 0 && choice < conflict.changes.length) {
-              resolveConflict(conflict, choice);
-              console.log(chalk.green(`  ✓ Applied: ${conflict.changes[choice].reviewer}'s change`));
-            }
-          } else {
-            console.log(chalk.dim('  Skipped'));
-          }
-        }
-
-        saveConflicts(projectDir, data.conflicts, data.base);
-
-        const remaining = data.conflicts.filter((c: any) => c.resolved === null).length;
-        if (remaining === 0) {
-          console.log(fmt.status('success', '\nAll conflicts resolved!'));
-          clearConflicts(projectDir);
-        } else {
-          console.log(chalk.yellow(`\n  ${remaining} conflict(s) remaining`));
-        }
-      }
-    });
-
 }