Function fixConflicts

packages/plugin/src/shared/conflict-fixer.ts:111–222

(directory: string, conflicts: ConflictResult["conflicts"])

}

export function fixConflicts(directory: string, conflicts: ConflictResult["conflicts"]): string[] {
    const actions: string[] = [];
    let updatedCompaction = false;
    let removedDcpPlugin = false;
    let disabledOmoHooks = false;

    if (conflicts.compactionAuto || conflicts.compactionPrune || conflicts.dcpPlugin) {
        for (const configPath of collectOpenCodeConfigPaths(directory)) {
            const config = readConfig(configPath);
            if (!config) {
                continue;
            }

            let changed = false;

            if (conflicts.compactionAuto || conflicts.compactionPrune) {
                const compaction = isRecord(config.compaction) ? config.compaction : {};

                if (compaction.auto !== false) {
                    compaction.auto = false;
                    changed = true;
                    updatedCompaction = true;
                }

                if (compaction.prune !== false) {
                    compaction.prune = false;
                    changed = true;
                    updatedCompaction = true;
                }

                config.compaction = compaction;
            }

            if (conflicts.dcpPlugin) {
                const plugins = Array.isArray(config.plugin) ? config.plugin : [];
                const filtered = filterDcpPluginEntries(plugins);

                if (filtered.removed) {
                    config.plugin = filtered.plugins;
                    changed = true;
                    removedDcpPlugin = true;
                }
            }

            if (changed) {
                writeConfig(configPath, config);
            }
        }
    }

    if (
        conflicts.omoContextWindowMonitor ||
        conflicts.omoPreemptiveCompaction ||
        conflicts.omoAnthropicRecovery
    ) {
        const hooksToDisable = new Set<string>();
        if (conflicts.omoContextWindowMonitor) {
            hooksToDisable.add("context-window-monitor");