@tecet/ollm 0.1.3

package/dist/services/mcpConfigBackup.js

@@ -0,0 +1,406 @@
+/**
+ * MCP Configuration Backup and Restore Service
+ *
+ * Handles automatic backup creation and restoration of MCP configuration files
+ * to prevent data loss from corruption or errors.
+ */
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+/**
+ * MCP Configuration Backup Service
+ */
+export class MCPConfigBackupService {
+    backupDir;
+    maxBackups;
+    constructor(maxBackups = 10) {
+        // Store backups in ~/.ollm/mcp/backups/
+        this.backupDir = path.join(os.homedir(), '.ollm', 'mcp', 'backups');
+        this.maxBackups = maxBackups;
+    }
+    /**
+     * Create a backup of the configuration file
+     * @param configPath - Path to the configuration file
+     * @param reason - Reason for creating the backup
+     * @returns Backup metadata
+     */
+    async createBackup(configPath, reason) {
+        try {
+            // Ensure backup directory exists
+            await this.ensureBackupDirExists();
+            // Check if source file exists
+            if (!fs.existsSync(configPath)) {
+                throw new Error(`Configuration file not found: ${configPath}`);
+            }
+            // Generate backup filename with timestamp
+            const timestamp = Date.now();
+            const basename = path.basename(configPath, '.json');
+            const backupFilename = `${basename}-${timestamp}.json`;
+            const backupPath = path.join(this.backupDir, backupFilename);
+            // Copy file to backup location. On Windows the file may be temporarily locked
+            // (EBUSY / EPERM). Retry a few times with backoff to tolerate transient locks
+            // commonly observed in test environments.
+            const maxAttempts = 5;
+            let attempt = 0;
+            while (true) {
+                try {
+                    await fs.promises.copyFile(configPath, backupPath);
+                    break;
+                }
+                catch (err) {
+                    attempt++;
+                    const code = err && (err.code || err.errno);
+                    const isTransient = code === 'EBUSY' || code === 'EPERM' || code === -4048;
+                    if (!isTransient || attempt >= maxAttempts) {
+                        throw err;
+                    }
+                    // small backoff
+                    await new Promise((r) => setTimeout(r, 50 * attempt));
+                }
+            }
+            // Create metadata file
+            const metadata = {
+                timestamp,
+                originalPath: configPath,
+                backupPath,
+                reason,
+            };
+            const metadataPath = `${backupPath}.meta`;
+            await fs.promises.writeFile(metadataPath, JSON.stringify(metadata, null, 2), 'utf-8');
+            // Clean up old backups
+            await this.cleanupOldBackups();
+            return metadata;
+        }
+        catch (error) {
+            throw new Error(`Failed to create backup: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    /**
+     * Restore configuration from the most recent backup
+     * @param configPath - Path to the configuration file to restore
+     * @returns True if restoration was successful
+     */
+    async restoreFromBackup(configPath) {
+        try {
+            // Find the most recent backup for this config file
+            const backup = await this.findMostRecentBackup(configPath);
+            if (!backup) {
+                console.warn('No backup found for restoration');
+                return false;
+            }
+            // Verify backup file exists and is valid JSON
+            const backupContent = await fs.promises.readFile(backup.backupPath, 'utf-8');
+            JSON.parse(backupContent); // Validate JSON
+            // Create a backup of the current (corrupted) file before restoring
+            const corruptedBackupPath = `${configPath}.corrupted-${Date.now()}`;
+            if (fs.existsSync(configPath)) {
+                await fs.promises.copyFile(configPath, corruptedBackupPath);
+            }
+            // Restore from backup
+            await fs.promises.copyFile(backup.backupPath, configPath);
+            console.log(`Configuration restored from backup: ${backup.backupPath}`);
+            console.log(`Corrupted file saved to: ${corruptedBackupPath}`);
+            return true;
+        }
+        catch (error) {
+            console.error('Failed to restore from backup:', error);
+            return false;
+        }
+    }
+    /**
+     * Restore configuration from a specific backup
+     * @param backupPath - Path to the backup file
+     * @param configPath - Path to the configuration file to restore
+     * @returns True if restoration was successful
+     */
+    async restoreFromSpecificBackup(backupPath, configPath) {
+        try {
+            // Verify backup file exists and is valid JSON
+            if (!fs.existsSync(backupPath)) {
+                throw new Error(`Backup file not found: ${backupPath}`);
+            }
+            const backupContent = await fs.promises.readFile(backupPath, 'utf-8');
+            JSON.parse(backupContent); // Validate JSON
+            // Create a backup of the current file before restoring
+            if (fs.existsSync(configPath)) {
+                const currentBackupPath = `${configPath}.before-restore-${Date.now()}`;
+                await fs.promises.copyFile(configPath, currentBackupPath);
+            }
+            // Restore from backup
+            await fs.promises.copyFile(backupPath, configPath);
+            console.log(`Configuration restored from: ${backupPath}`);
+            return true;
+        }
+        catch (error) {
+            console.error('Failed to restore from specific backup:', error);
+            return false;
+        }
+    }
+    /**
+     * List all available backups for a configuration file
+     * @param configPath - Path to the configuration file
+     * @returns Array of backup metadata, sorted by timestamp (newest first)
+     */
+    async listBackups(configPath) {
+        try {
+            // Ensure backup directory exists
+            if (!fs.existsSync(this.backupDir)) {
+                return [];
+            }
+            // Read all files in backup directory
+            const files = await fs.promises.readdir(this.backupDir);
+            // Filter for metadata files
+            const metadataFiles = files.filter((f) => f.endsWith('.meta'));
+            // Read and parse metadata
+            const backups = [];
+            for (const metaFile of metadataFiles) {
+                const metaPath = path.join(this.backupDir, metaFile);
+                try {
+                    const content = await fs.promises.readFile(metaPath, 'utf-8');
+                    let metadata = null;
+                    try {
+                        metadata = JSON.parse(content);
+                    }
+                    catch (_parseError) {
+                        // Attempt to recover a JSON object from the file if possible
+                        const m = content.match(/(\{[\s\S]*\})/);
+                        if (m) {
+                            try {
+                                metadata = JSON.parse(m[1]);
+                            }
+                            catch {
+                                metadata = null;
+                            }
+                        }
+                    }
+                    if (metadata && metadata.originalPath === configPath) {
+                        backups.push(metadata);
+                    }
+                }
+                catch (_error) {
+                    // Ignore unreadable metadata files silently to avoid noisy test output
+                }
+            }
+            // Sort by timestamp (newest first)
+            backups.sort((a, b) => b.timestamp - a.timestamp);
+            return backups;
+        }
+        catch (error) {
+            console.error('Failed to list backups:', error);
+            return [];
+        }
+    }
+    /**
+     * Validate a configuration file
+     * @param configPath - Path to the configuration file
+     * @returns True if valid, false otherwise
+     */
+    async validateConfig(configPath) {
+        try {
+            if (!fs.existsSync(configPath)) {
+                return false;
+            }
+            const content = await fs.promises.readFile(configPath, 'utf-8');
+            const config = JSON.parse(content);
+            // Basic validation
+            if (!config.mcpServers || typeof config.mcpServers !== 'object') {
+                return false;
+            }
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * Attempt to recover from a corrupted configuration file
+     * @param configPath - Path to the corrupted configuration file
+     * @returns True if recovery was successful
+     */
+    async recoverFromCorruption(configPath) {
+        console.log('Attempting to recover from configuration corruption...');
+        // First, try to restore from the most recent backup
+        const restored = await this.restoreFromBackup(configPath);
+        if (restored) {
+            console.log('Configuration successfully restored from backup');
+            return true;
+        }
+        // If no backup available, check if the current file is actually corrupted
+        // Don't overwrite a valid config just because backups don't exist!
+        try {
+            if (fs.existsSync(configPath)) {
+                const content = await fs.promises.readFile(configPath, 'utf-8');
+                const data = JSON.parse(content);
+                // If we can parse it and it has the right structure, it's not corrupted
+                if (data &&
+                    typeof data === 'object' &&
+                    data.mcpServers &&
+                    typeof data.mcpServers === 'object') {
+                    console.log('Current configuration is valid, not overwriting');
+                    return true; // File is fine, no need to create empty config
+                }
+            }
+        }
+        catch (_checkError) {
+            // File is truly corrupted or missing, proceed to create empty config
+            console.log('Configuration is truly corrupted or missing');
+        }
+        // Only create empty config if file is missing or truly corrupted
+        console.log('No backup available and file is corrupted/missing, creating new empty configuration');
+        try {
+            const emptyConfig = {
+                mcpServers: {},
+            };
+            // Ensure directory exists
+            const dir = path.dirname(configPath);
+            if (!fs.existsSync(dir)) {
+                await fs.promises.mkdir(dir, { recursive: true });
+            }
+            // Write empty configuration
+            await fs.promises.writeFile(configPath, JSON.stringify(emptyConfig, null, 2), 'utf-8');
+            console.log('New empty configuration created');
+            return true;
+        }
+        catch (error) {
+            console.error('Failed to create new configuration:', error);
+            return false;
+        }
+    }
+    /**
+     * Find the most recent backup for a configuration file
+     * @param configPath - Path to the configuration file
+     * @returns Most recent backup metadata, or null if none found
+     */
+    async findMostRecentBackup(configPath) {
+        const backups = await this.listBackups(configPath);
+        return backups.length > 0 ? backups[0] : null;
+    }
+    /**
+     * Clean up old backups, keeping only the most recent ones
+     */
+    async cleanupOldBackups() {
+        try {
+            // Read all files in backup directory
+            const files = await fs.promises.readdir(this.backupDir);
+            // Filter for metadata files
+            const metadataFiles = files.filter((f) => f.endsWith('.meta'));
+            // Read and parse metadata
+            const backups = [];
+            for (const metaFile of metadataFiles) {
+                const metaPath = path.join(this.backupDir, metaFile);
+                try {
+                    const content = await fs.promises.readFile(metaPath, 'utf-8');
+                    let metadata = null;
+                    try {
+                        metadata = JSON.parse(content);
+                    }
+                    catch (_parseError) {
+                        const m = content.match(/(\{[\s\S]*\})/);
+                        if (m) {
+                            try {
+                                metadata = JSON.parse(m[1]);
+                            }
+                            catch {
+                                metadata = null;
+                            }
+                        }
+                    }
+                    if (metadata)
+                        backups.push(metadata);
+                }
+                catch (_error) {
+                    // Ignore unreadable metadata files silently to avoid noisy test output
+                }
+            }
+            // Sort by timestamp (oldest first)
+            backups.sort((a, b) => a.timestamp - b.timestamp);
+            // Delete old backups if we exceed the limit
+            if (backups.length > this.maxBackups) {
+                const toDelete = backups.slice(0, backups.length - this.maxBackups);
+                for (const backup of toDelete) {
+                    try {
+                        // Delete backup file
+                        if (fs.existsSync(backup.backupPath)) {
+                            try {
+                                await fs.promises.unlink(backup.backupPath);
+                            }
+                            catch (err) {
+                                // Ignore missing file races - another process/test may have removed it
+                                if (err && (err.code === 'ENOENT' || err.errno === -4058)) {
+                                    // silent
+                                }
+                                else if (err && (err.code === 'EPERM' || err.code === 'EACCES')) {
+                                    // On Windows EPERM/EACCES can occur if file is locked. Attempt to relax permissions then unlink.
+                                    try {
+                                        await fs.promises.chmod(backup.backupPath, 0o666);
+                                        await fs.promises.unlink(backup.backupPath);
+                                    }
+                                    catch {
+                                        // If still failing, ignore in test runs to avoid spam, otherwise rethrow
+                                        if (process.env.NODE_ENV === 'test' || process.env.VITEST) {
+                                            // silent in tests
+                                        }
+                                        else {
+                                            throw err;
+                                        }
+                                    }
+                                }
+                                else {
+                                    throw err;
+                                }
+                            }
+                        }
+                        // Delete metadata file
+                        const metaPath = `${backup.backupPath}.meta`;
+                        if (fs.existsSync(metaPath)) {
+                            try {
+                                await fs.promises.unlink(metaPath);
+                            }
+                            catch (err) {
+                                if (err && (err.code === 'ENOENT' || err.errno === -4058)) {
+                                    // silent
+                                }
+                                else if (err && (err.code === 'EPERM' || err.code === 'EACCES')) {
+                                    try {
+                                        await fs.promises.chmod(metaPath, 0o666);
+                                        await fs.promises.unlink(metaPath);
+                                    }
+                                    catch {
+                                        if (process.env.NODE_ENV === 'test' || process.env.VITEST) {
+                                            // silent in tests
+                                        }
+                                        else {
+                                            throw err;
+                                        }
+                                    }
+                                }
+                                else {
+                                    throw err;
+                                }
+                            }
+                        }
+                    }
+                    catch (error) {
+                        if (process.env.NODE_ENV !== 'test' && !process.env.VITEST) {
+                            console.warn(`Failed to delete old backup ${backup.backupPath}:`, error);
+                        }
+                    }
+                }
+            }
+        }
+        catch (error) {
+            console.error('Failed to cleanup old backups:', error);
+        }
+    }
+    /**
+     * Ensure backup directory exists
+     */
+    async ensureBackupDirExists() {
+        if (!fs.existsSync(this.backupDir)) {
+            await fs.promises.mkdir(this.backupDir, { recursive: true });
+        }
+    }
+}
+// Singleton instance
+export const mcpConfigBackup = new MCPConfigBackupService();
+//# sourceMappingURL=mcpConfigBackup.js.map

package/dist/services/mcpConfigBackup.js.map

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

package/dist/services/mcpConfigService.d.ts

@@ -0,0 +1,133 @@
+/**
+ * MCP Configuration Service
+ *
+ * Handles loading, saving, and watching MCP configuration files.
+ * Supports both user-level (~/.ollm/settings/mcp.json) and
+ * workspace-level (.ollm/settings/mcp.json) configurations.
+ */
+import type { MCPServerConfig } from '@ollm/ollm-cli-core/mcp/types.js';
+/**
+ * MCP configuration with server definitions
+ */
+export interface MCPConfigFile {
+    mcpServers: Record<string, MCPServerConfig>;
+}
+/**
+ * Configuration change event
+ */
+export interface ConfigChangeEvent {
+    /** Type of change */
+    type: 'user' | 'workspace';
+    /** Path to the changed file */
+    path: string;
+    /** Timestamp of the change */
+    timestamp: number;
+}
+/**
+ * Configuration change listener
+ */
+export type ConfigChangeListener = (event: ConfigChangeEvent) => void;
+/**
+ * MCP Configuration Service
+ *
+ * Manages MCP configuration files with atomic writes, validation,
+ * and file watching for external changes.
+ */
+export declare class MCPConfigService {
+    private userConfigPath;
+    private workspaceConfigPath;
+    private watchers;
+    private listeners;
+    private isWatching;
+    /**
+     * Create a new MCP Configuration Service
+     * @param basePath - Optional base path for config files (for testing)
+     */
+    constructor(basePath?: string);
+    /**
+     * Load MCP configuration from both user and workspace levels
+     * Workspace configuration takes precedence over user configuration
+     * @returns Merged MCP configuration
+     */
+    loadMCPConfig(): Promise<MCPConfigFile>;
+    /**
+     * Save MCP configuration to user-level config file
+     * Uses atomic write to prevent corruption
+     * @param config - Configuration to save
+     */
+    saveMCPConfig(config: MCPConfigFile): Promise<void>;
+    /**
+     * Update a specific server configuration
+     * Performs partial update without affecting other servers
+     * @param serverName - Name of the server to update
+     * @param config - Server configuration to update
+     */
+    updateServerConfig(serverName: string, config: MCPServerConfig): Promise<void>;
+    /**
+     * Remove a server from configuration
+     * @param serverName - Name of the server to remove
+     */
+    removeServerConfig(serverName: string): Promise<void>;
+    /**
+     * Start watching configuration files for external changes
+     */
+    startWatching(): void;
+    /**
+     * Stop watching configuration files
+     */
+    stopWatching(): void;
+    /**
+     * Add a configuration change listener
+     * @param listener - Listener function
+     */
+    addChangeListener(listener: ConfigChangeListener): void;
+    /**
+     * Remove a configuration change listener
+     * @param listener - Listener function
+     */
+    removeChangeListener(listener: ConfigChangeListener): void;
+    /**
+     * Get the user config file path
+     */
+    getUserConfigPath(): string;
+    /**
+     * Get the workspace config file path
+     */
+    getWorkspaceConfigPath(): string;
+    /**
+     * Load configuration from a specific file
+     * @param filePath - Path to the configuration file
+     * @returns Configuration object or empty config if file doesn't exist
+     */
+    private loadConfigFile;
+    /**
+     * Save configuration to a specific file with atomic write
+     * @param filePath - Path to the configuration file
+     * @param config - Configuration to save
+     */
+    private saveConfigFile;
+    /**
+     * Watch a configuration file for changes
+     * @param filePath - Path to the configuration file
+     * @param type - Type of configuration (user or workspace)
+     */
+    private watchConfigFile;
+    /**
+     * Notify all listeners of a configuration change
+     * @param event - Configuration change event
+     */
+    private notifyListeners;
+    /**
+     * Validate MCP configuration
+     * @param config - Configuration to validate
+     * @throws Error if configuration is invalid
+     */
+    private validateConfig;
+    /**
+     * Ensure a directory exists, creating it if necessary
+     * @param directory - Directory path to ensure exists
+     */
+    private ensureDirectoryExists;
+}
+export declare const mcpConfigService: MCPConfigService;
+//# sourceMappingURL=mcpConfigService.d.ts.map

package/dist/services/mcpConfigService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcpConfigService.d.ts","sourceRoot":"","sources":["../../src/services/mcpConfigService.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC7C;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,qBAAqB;IACrB,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,8BAA8B;IAC9B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;AAEtE;;;;;GAKG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAqC;IACrD,OAAO,CAAC,SAAS,CAA8B;IAC/C,OAAO,CAAC,UAAU,CAAS;IAE3B;;;OAGG;gBACS,QAAQ,CAAC,EAAE,MAAM;IAW7B;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAe7C;;;;OAIG;IACG,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBzD;;;;;OAKG;IACG,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBpF;;;OAGG;IACG,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW3D;;OAEG;IACH,aAAa,IAAI,IAAI;IAcrB;;OAEG;IACH,YAAY,IAAI,IAAI;IAepB;;;OAGG;IACH,iBAAiB,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI;IAIvD;;;OAGG;IACH,oBAAoB,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI;IAO1D;;OAEG;IACH,iBAAiB,IAAI,MAAM;IAI3B;;OAEG;IACH,sBAAsB,IAAI,MAAM;IAIhC;;;;OAIG;YACW,cAAc;IA6C5B;;;;OAIG;YACW,cAAc;IA+B5B;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAsCvB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAUvB;;;;OAIG;IACH,OAAO,CAAC,cAAc;IA2CtB;;;OAGG;YACW,qBAAqB;CAWpC;AAGD,eAAO,MAAM,gBAAgB,kBAAyB,CAAC"}