metacoding/lib/services/conflict-resolution.js

Cross-agent workflow skill for modern coding agents with gated planning, testing, verification, and handoff defaults

"use strict";
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    var desc = Object.getOwnPropertyDescriptor(m, k);
    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
      desc = { enumerable: true, get: function() { return m[k]; } };
    }
    Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
    if (k2 === undefined) k2 = k;
    o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
    Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
    o["default"] = v;
});
var __importStar = (this && this.__importStar) || (function () {
    var ownKeys = function(o) {
        ownKeys = Object.getOwnPropertyNames || function (o) {
            var ar = [];
            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
            return ar;
        };
        return ownKeys(o);
    };
    return function (mod) {
        if (mod && mod.__esModule) return mod;
        var result = {};
        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
        __setModuleDefault(result, mod);
        return result;
    };
})();
var __importDefault = (this && this.__importDefault) || function (mod) {
    return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.ConflictResolutionService = void 0;
const path = __importStar(require("path"));
const fs = __importStar(require("fs-extra"));
const inquirer_1 = __importDefault(require("inquirer"));
const backup_1 = require("./backup");
class ConflictResolutionService {
    constructor() {
        this.backupService = new backup_1.BackupService();
    }
    async detectConflicts(templateFiles, existingFiles) {
        const conflicts = [];
        for (const templateFile of templateFiles) {
            const filePath = templateFile.path;
            if (existingFiles.includes(filePath)) {
                const hasChanges = await this.backupService.hasFileChanged(filePath, templateFile.content);
                if (hasChanges) {
                    const userContent = await fs.readFile(filePath, 'utf8');
                    conflicts.push({
                        filePath,
                        templateContent: templateFile.content,
                        userContent,
                        hasChanges: true,
                    });
                }
            }
        }
        return conflicts;
    }
    async getConflictResolution(conflicts) {
        if (conflicts.length === 0) {
            return [];
        }
        const resolutions = [];
        console.log(`\n🔍 Found ${conflicts.length} conflicts that need resolution:\n`);
        for (const conflict of conflicts) {
            console.log(`Conflict in: ${conflict.filePath}`);
        }
        const { globalChoice } = await inquirer_1.default.prompt([
            {
                type: 'list',
                name: 'globalChoice',
                message: 'How would you like to handle conflicts?',
                choices: [
                    { name: 'Keep my versions (save as user.filename)', value: 'keep' },
                    { name: 'Replace with template versions', value: 'replace' },
                    { name: 'Review each conflict individually', value: 'individual' },
                    { name: 'Cancel update', value: 'cancel' },
                ],
            },
        ]);
        if (globalChoice === 'cancel') {
            throw new Error('Update cancelled by user');
        }
        if (globalChoice === 'individual') {
            for (const conflict of conflicts) {
                const { choice } = await inquirer_1.default.prompt([
                    {
                        type: 'list',
                        name: 'choice',
                        message: `Conflict in ${conflict.filePath}:`,
                        choices: [
                            {
                                name: 'Keep my version (save as user.filename)',
                                value: 'keep',
                            },
                            { name: 'Replace with template version', value: 'replace' },
                            { name: 'Skip this file', value: 'skip' },
                        ],
                    },
                ]);
                resolutions.push({
                    action: choice,
                    userFileName: choice === 'keep'
                        ? this.getUserFileName(conflict.filePath)
                        : undefined,
                    applyToAll: false,
                });
            }
        }
        else {
            for (const conflict of conflicts) {
                resolutions.push({
                    action: globalChoice,
                    userFileName: globalChoice === 'keep'
                        ? this.getUserFileName(conflict.filePath)
                        : undefined,
                    applyToAll: true,
                });
            }
        }
        return resolutions;
    }
    getUserFileName(originalPath) {
        const dir = path.dirname(originalPath);
        const filename = path.basename(originalPath);
        return path.join(dir, `user.${filename}`);
    }
    async applyResolutions(conflicts, resolutions) {
        const preservedFiles = [];
        const updatedFiles = [];
        for (let i = 0; i < conflicts.length; i++) {
            const conflict = conflicts[i];
            const resolution = resolutions[i];
            if (!conflict || !resolution) {
                continue;
            }
            switch (resolution.action) {
                case 'keep':
                    if (resolution.userFileName) {
                        await fs.move(conflict.filePath, resolution.userFileName);
                        preservedFiles.push(resolution.userFileName);
                        await fs.writeFile(conflict.filePath, conflict.templateContent);
                        updatedFiles.push(conflict.filePath);
                    }
                    break;
                case 'replace':
                    await fs.writeFile(conflict.filePath, conflict.templateContent);
                    updatedFiles.push(conflict.filePath);
                    break;
                case 'skip':
                    break;
            }
        }
        return { preservedFiles, updatedFiles };
    }
}
exports.ConflictResolutionService = ConflictResolutionService;
//# sourceMappingURL=conflict-resolution.js.map