k0ntext 3.3.0 → 3.5.0

package/dist/template-sync/comparator.js

@@ -0,0 +1,353 @@
+/**
+ * Template Comparator
+ *
+ * Compares template files with local files to detect changes.
+ * Determines file state: identical, safe-update, conflict, new, deleted, user-only.
+ */
+import { promises as fs } from 'fs';
+import path from 'path';
+import { TemplateHasher } from './hasher.js';
+import { TemplateManifestManager } from './manifest.js';
+import { TemplateScanner } from './scanner.js';
+/**
+ * Compares template versions to detect changes
+ */
+export class TemplateComparator {
+    db;
+    projectRoot;
+    templateRoot;
+    manifestManager;
+    verbose = false;
+    constructor(db, projectRoot = process.cwd(), templateRoot, verbose = false) {
+        this.db = db;
+        this.projectRoot = projectRoot;
+        this.templateRoot = templateRoot;
+        this.manifestManager = new TemplateManifestManager(db, projectRoot);
+        this.verbose = verbose;
+    }
+    /**
+     * Compare template files with local files
+     *
+     * @param options - Comparison options
+     * @returns Array of file comparisons
+     */
+    async compare(options = {}) {
+        const startTime = Date.now();
+        // Load manifest for user modification tracking
+        const manifest = await this.manifestManager.loadReconciledManifest();
+        // Define paths
+        const templateBasePath = this.templateRoot;
+        const localBasePath = path.join(this.projectRoot, '.claude');
+        // Scan template files
+        const templateFiles = await TemplateScanner.scanAndHash(templateBasePath, options.subdirectories);
+        // Scan local files
+        const localFiles = await this.scanLocalFiles(localBasePath, options.subdirectories);
+        // Build comparison map
+        const comparisons = await this.buildComparisons(templateFiles, localFiles, manifest, templateBasePath, localBasePath);
+        // Count by state
+        const counts = this.countByState(comparisons);
+        return {
+            comparisons,
+            counts,
+            total: comparisons.length,
+            durationMs: Date.now() - startTime
+        };
+    }
+    /**
+     * Scan local files in .claude/
+     *
+     * @param localBasePath - Base path to .claude/
+     * @param subdirectories - Subdirectories to scan
+     * @returns Map of relative path to hash
+     */
+    async scanLocalFiles(localBasePath, subdirectories) {
+        const localFiles = new Map();
+        try {
+            const dirs = subdirectories ?? TemplateScanner.getSyncedSubdirs();
+            for (const subdir of dirs) {
+                const dirPath = path.join(localBasePath, subdir);
+                try {
+                    // Read directory entries directly
+                    const entries = await fs.readdir(dirPath, { withFileTypes: true });
+                    if (this.verbose) {
+                        console.log(`[DEBUG] Scanning local directory: ${dirPath}`);
+                        console.log(`[DEBUG] Found ${entries.length} entries`);
+                    }
+                    for (const entry of entries) {
+                        if (entry.isFile() && !this.shouldExcludeFile(entry.name)) {
+                            const fullPath = path.join(dirPath, entry.name);
+                            const hash = await TemplateHasher.hashFileSafe(fullPath);
+                            // Normalize to forward slashes for consistency
+                            const relativePath = path.join(subdir, entry.name).split(path.sep).join('/');
+                            if (this.verbose) {
+                                console.log(`[DEBUG] Found local file: ${relativePath} (hash: ${hash})`);
+                            }
+                            localFiles.set(relativePath, {
+                                hash,
+                                exists: true
+                            });
+                        }
+                        else if (entry.isDirectory()) {
+                            // Recursively scan subdirectories within this subdir
+                            await this.scanLocalFilesRecursive(path.join(dirPath, entry.name), path.join(subdir, entry.name), localFiles);
+                        }
+                    }
+                }
+                catch (error) {
+                    // Directory doesn't exist - skip
+                    if (this.verbose) {
+                        console.log(`[DEBUG] Error scanning ${dirPath}: ${error.code || error}`);
+                    }
+                    if (error.code !== 'ENOENT') {
+                        console.warn(`Warning: Could not scan ${dirPath}: ${error}`);
+                    }
+                }
+            }
+            if (this.verbose) {
+                console.log(`[DEBUG] Total local files found: ${localFiles.size}`);
+            }
+        }
+        catch (error) {
+            // Base directory doesn't exist yet - return empty map
+            if (this.verbose) {
+                console.log(`[DEBUG] Base directory error: ${error}`);
+            }
+        }
+        return localFiles;
+    }
+    /**
+     * Recursively scan local files within a subdirectory
+     */
+    async scanLocalFilesRecursive(dirPath, relativePrefix, localFiles) {
+        try {
+            const entries = await fs.readdir(dirPath, { withFileTypes: true });
+            for (const entry of entries) {
+                if (entry.isFile() && !this.shouldExcludeFile(entry.name)) {
+                    const fullPath = path.join(dirPath, entry.name);
+                    const hash = await TemplateHasher.hashFileSafe(fullPath);
+                    // Normalize to forward slashes for consistency
+                    const relativePath = path.join(relativePrefix, entry.name).split(path.sep).join('/');
+                    localFiles.set(relativePath, {
+                        hash,
+                        exists: true
+                    });
+                }
+                else if (entry.isDirectory()) {
+                    await this.scanLocalFilesRecursive(path.join(dirPath, entry.name), path.join(relativePrefix, entry.name), localFiles);
+                }
+            }
+        }
+        catch (error) {
+            // Directory doesn't exist - skip
+        }
+    }
+    /**
+     * Check if a file should be excluded from scanning
+     */
+    shouldExcludeFile(filename) {
+        const excludePatterns = ['.DS_Store', '*.log', '.k0ntext-manifest.json'];
+        return excludePatterns.some(pattern => {
+            if (pattern.includes('*')) {
+                const regex = new RegExp('^' + pattern.replace(/\*/g, '.*').replace(/\?/g, '.') + '$');
+                return regex.test(filename);
+            }
+            return filename === pattern;
+        });
+    }
+    /**
+     * Build comparison results
+     *
+     * @param templateFiles - Files from templates/base/.claude/
+     * @param localFiles - Files from local .claude/
+     * @param manifest - Template manifest
+     * @param templateBasePath - Template base path
+     * @param localBasePath - Local base path
+     * @returns Array of file comparisons
+     */
+    async buildComparisons(templateFiles, localFiles, manifest, templateBasePath, localBasePath) {
+        const comparisons = [];
+        // Process template files
+        for (const templateFile of templateFiles) {
+            const localInfo = localFiles.get(templateFile.relativePath);
+            const manifestEntry = manifest?.files[templateFile.relativePath];
+            const comparison = await this.compareFile(templateFile, localInfo?.hash, localInfo?.exists ?? false, manifestEntry);
+            comparisons.push(comparison);
+        }
+        // Find user-only files (exist locally but not in template)
+        for (const [relativePath, localInfo] of localFiles.entries()) {
+            const isInTemplate = templateFiles.some(f => f.relativePath === relativePath);
+            if (!isInTemplate && localInfo.exists) {
+                // User-only file
+                comparisons.push({
+                    path: relativePath,
+                    state: 'user-only',
+                    templateHash: '',
+                    localHash: localInfo.hash,
+                    userModified: false
+                });
+            }
+        }
+        return comparisons;
+    }
+    /**
+     * Compare a single file
+     *
+     * @param templateFile - Template file metadata
+     * @param localHash - Local file hash (if exists)
+     * @param localExists - Whether local file exists
+     * @param manifestEntry - Manifest entry (if any)
+     * @returns File comparison
+     */
+    async compareFile(templateFile, localHash, localExists, manifestEntry) {
+        const templateHash = templateFile.hash;
+        const manifestUserModified = manifestEntry?.userModified ?? false;
+        const originalHash = manifestEntry?.originalHash;
+        // Determine state
+        let state;
+        let userModified = manifestUserModified;
+        if (!localExists) {
+            // File exists in template but not locally
+            state = 'new';
+        }
+        else if (!localHash) {
+            // Shouldn't happen, but handle gracefully
+            state = 'new';
+        }
+        else if (localHash === templateHash) {
+            // Files are identical
+            state = 'identical';
+        }
+        else if (manifestEntry && localHash === manifestEntry.hash) {
+            // File matches manifest (not user-modified), but template changed
+            state = 'safe-update';
+        }
+        else {
+            // File hash doesn't match template
+            // Check if this is a user modification
+            if (manifestUserModified) {
+                // Already marked as user-modified in manifest
+                state = 'conflict';
+            }
+            else if (manifestEntry && localHash !== manifestEntry.hash) {
+                // File differs from manifest - user modified it after sync
+                state = 'conflict';
+                userModified = true; // Detect and flag user modification
+            }
+            else if (!manifestEntry) {
+                // No manifest entry, file was modified before tracking started
+                state = 'conflict';
+            }
+            else {
+                // File hash doesn't match template or manifest
+                state = 'conflict';
+            }
+        }
+        return {
+            path: templateFile.relativePath,
+            state,
+            templateHash,
+            localHash: localHash ?? '',
+            userModified,
+            originalHash
+        };
+    }
+    /**
+     * Count comparisons by state
+     *
+     * @param comparisons - Array of comparisons
+     * @returns Record of state to count
+     */
+    countByState(comparisons) {
+        const counts = {
+            identical: 0,
+            'safe-update': 0,
+            conflict: 0,
+            new: 0,
+            deleted: 0,
+            'user-only': 0
+        };
+        for (const comparison of comparisons) {
+            counts[comparison.state]++;
+        }
+        return counts;
+    }
+    /**
+     * Filter comparisons by state
+     *
+     * @param comparisons - Array of comparisons
+     * @param states - States to include
+     * @returns Filtered comparisons
+     */
+    static filterByState(comparisons, states) {
+        return comparisons.filter(c => states.includes(c.state));
+    }
+    /**
+     * Get comparisons needing action
+     *
+     * @param comparisons - Array of comparisons
+     * @returns Comparisons that need user action or update
+     */
+    static getActionableComparisons(comparisons) {
+        return TemplateComparator.filterByState(comparisons, [
+            'safe-update',
+            'conflict',
+            'new'
+        ]);
+    }
+    /**
+     * Get comparisons with conflicts
+     *
+     * @param comparisons - Array of comparisons
+     * @returns Comparisons with conflicts
+     */
+    static getConflicts(comparisons) {
+        return TemplateComparator.filterByState(comparisons, ['conflict']);
+    }
+    /**
+     * Get safe updates
+     *
+     * @param comparisons - Array of comparisons
+     * @returns Comparisons that can be safely updated
+     */
+    static getSafeUpdates(comparisons) {
+        return TemplateComparator.filterByState(comparisons, ['safe-update', 'new']);
+    }
+    /**
+     * Format comparison for display
+     *
+     * @param comparison - File comparison
+     * @returns Formatted string
+     */
+    static formatComparison(comparison) {
+        const stateIcon = {
+            identical: '✓',
+            'safe-update': '→',
+            conflict: '⚠',
+            new: '+',
+            deleted: '-',
+            'user-only': '👤'
+        };
+        const icon = stateIcon[comparison.state];
+        const userFlag = comparison.userModified ? ' [modified]' : '';
+        return `${icon} ${comparison.path}${userFlag}`;
+    }
+    /**
+     * Generate summary text for comparison results
+     *
+     * @param result - Comparison result
+     * @returns Formatted summary
+     */
+    static generateSummary(result) {
+        const lines = [];
+        lines.push(`Template Comparison Summary:`);
+        lines.push(`  Total files: ${result.total}`);
+        lines.push(`  Identical: ${result.counts.identical}`);
+        lines.push(`  Safe updates: ${result.counts['safe-update']}`);
+        lines.push(`  New files: ${result.counts.new}`);
+        lines.push(`  Conflicts: ${result.counts.conflict}`);
+        lines.push(`  User-only: ${result.counts['user-only']}`);
+        lines.push(`  Duration: ${result.durationMs}ms`);
+        return lines.join('\n');
+    }
+}
+//# sourceMappingURL=comparator.js.map

package/dist/template-sync/comparator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"comparator.js","sourceRoot":"","sources":["../../src/template-sync/comparator.ts"],"names":[],"mappings":"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"}

package/dist/template-sync/conflict-resolver.d.ts

@@ -0,0 +1,112 @@
+/**
+ * Conflict Resolver
+ *
+ * Handles interactive conflict resolution for template sync.
+ * Uses @inquirer/prompts for user interaction.
+ */
+import type { FileComparison, ResolutionChoice, ResolutionResult } from './types.js';
+/**
+ * Resolution options for a single conflict
+ */
+export interface ResolutionOptions {
+    /** Whether to show diffs by default */
+    showDiff?: boolean;
+    /** Whether to allow batch resolution */
+    allowBatch?: boolean;
+    /** Default choice */
+    defaultChoice?: ResolutionChoice;
+}
+/**
+ * Batch resolution strategy
+ */
+export type BatchStrategy = 'keep-all' | 'overwrite-all' | 'individual';
+/**
+ * Handles interactive conflict resolution
+ */
+export declare class ConflictResolver {
+    private projectRoot;
+    private templateRoot;
+    constructor(projectRoot: string | undefined, templateRoot: string);
+    /**
+     * Resolve conflicts interactively
+     *
+     * @param conflicts - Array of conflicting comparisons
+     * @param options - Resolution options
+     * @returns Array of resolution results
+     */
+    resolveConflicts(conflicts: FileComparison[], options?: ResolutionOptions): Promise<ResolutionResult[]>;
+    /**
+     * Resolve a single conflict
+     *
+     * @param conflict - File comparison in conflict
+     * @param options - Resolution options
+     * @returns Resolution result
+     */
+    resolveConflict(conflict: FileComparison, options?: ResolutionOptions): Promise<ResolutionResult>;
+    /**
+     * Prompt for batch resolution strategy
+     *
+     * @param count - Number of conflicts
+     * @returns Batch strategy
+     */
+    private promptBatchStrategy;
+    /**
+     * Prompt for resolution of a single conflict
+     *
+     * @param conflict - File comparison
+     * @param options - Resolution options
+     * @returns Resolution choice
+     */
+    private promptResolution;
+    /**
+     * Show conflict information
+     *
+     * @param conflict - File comparison
+     */
+    private showConflictInfo;
+    /**
+     * Show conflict summary
+     *
+     * @param conflicts - Array of conflicts
+     */
+    private showConflictSummary;
+    /**
+     * Show diff for a conflict
+     *
+     * @param conflict - File comparison
+     */
+    private showDiff;
+    /**
+     * Format file state for display
+     *
+     * @param state - File state
+     * @returns Formatted state string
+     */
+    private formatState;
+    /**
+     * Apply resolution results using merger
+     *
+     * @param resolutions - Array of resolution results
+     * @param conflicts - Original conflicts for reference
+     * @returns Results of applied resolutions
+     */
+    applyResolutions(resolutions: ResolutionResult[], conflicts: FileComparison[]): Promise<{
+        applied: number;
+        skipped: number;
+        errors: number;
+    }>;
+    /**
+     * Prompt for archival of removed files
+     *
+     * @param removedFiles - Array of removed file paths
+     * @returns true if user wants to archive
+     */
+    promptArchiveRemoved(removedFiles: string[]): Promise<boolean>;
+    /**
+     * Show dry run results
+     *
+     * @param comparisons - File comparisons
+     */
+    showDryRunResults(comparisons: FileComparison[]): void;
+}
+//# sourceMappingURL=conflict-resolver.d.ts.map

package/dist/template-sync/conflict-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-resolver.d.ts","sourceRoot":"","sources":["../../src/template-sync/conflict-resolver.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAGrF;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,uCAAuC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,wCAAwC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,qBAAqB;IACrB,aAAa,CAAC,EAAE,gBAAgB,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,eAAe,GAAG,YAAY,CAAC;AAExE;;GAEG;AACH,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,YAAY;gBADZ,WAAW,EAAE,MAAM,YAAgB,EACnC,YAAY,EAAE,MAAM;IAG9B;;;;;;OAMG;IACG,gBAAgB,CACpB,SAAS,EAAE,cAAc,EAAE,EAC3B,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,gBAAgB,EAAE,CAAC;IA6C9B;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,cAAc,EACxB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,gBAAgB,CAAC;IAmB5B;;;;;OAKG;YACW,mBAAmB;IAuBjC;;;;;;OAMG;YACW,gBAAgB;IAuC9B;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAgBxB;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAa3B;;;;OAIG;YACW,QAAQ;IAyBtB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAanB;;;;;;OAMG;IACG,gBAAgB,CACpB,WAAW,EAAE,gBAAgB,EAAE,EAC/B,SAAS,EAAE,cAAc,EAAE,GAC1B,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IA8BhE;;;;;OAKG;IACG,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAqBpE;;;;OAIG;IACH,iBAAiB,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,IAAI;CAwCvD"}