filemayor 3.6.0 → 4.0.7

package/core/fs-abstraction.js

@@ -23,7 +23,7 @@ class FileMayorFS {
             useJournal: true,
             dryRun: false,
             trashPath: path.join(os.tmpdir(), 'filemayor_trash'),
-            journalPath: path.join(os.homedir(), '.filemayor-master-journal.json'),
+            journalPath: path.join(os.homedir(), '.filemayor-master-journal.ndjson'),
             ...options
         };
         this.sessionJournal = [];
@@ -77,6 +77,10 @@ class FileMayorFS {
             const destDir = path.dirname(destination);
             await fs.mkdir(destDir, { recursive: true });
 
+            // WAL: write pending entry BEFORE the operation
+            const opId = crypto.randomUUID();
+            await this._journalPending(opId, source, destination, 'move', snapshot);
+
             try {
                 await fs.rename(source, destination);
             } catch (err) {
@@ -86,11 +90,13 @@ class FileMayorFS {
                 } else throw err;
             }
 
+            // WAL: record completion AFTER the operation
+            await this._journalDone(opId);
+
             result.status = 'success';
             this.stats.opsSucceeded++;
             this.stats.filesMoved++;
             this.stats.totalBytesProcessed += snapshot.size || 0;
-            await this._logToJournal(source, destination, 'move', snapshot);
 
         } catch (err) {
             result.status = 'error';
@@ -126,61 +132,79 @@ class FileMayorFS {
     }
 
     /** ------------------------
-     * Journaling
+     * Journaling (WAL)
      * -------------------------*/
-    async _logToJournal(source, destination, action, snapshot) {
+    async _journalWriteLine(entry) {
         if (!this.options.useJournal) return;
+        try {
+            const line = JSON.stringify(entry) + '\n';
+            fssync.appendFileSync(this.options.journalPath, line, 'utf8');
+        } catch (err) {
+            console.error(`[FAIL] Journal write failed: ${err.message}`);
+        }
+    }
+
+    async _logToJournal(source, destination, action, snapshot) {
+        // WAL: record intent BEFORE operation (called pre-move),
+        // then update to 'done' AFTER (called post-move).
+        // This is handled by _journalPending / _journalDone.
+    }
 
+    async _journalPending(id, source, destination, action, snapshot) {
         const entry = {
-            id: crypto.randomUUID(),
+            id,
             timestamp: new Date().toISOString(),
             action,
             source,
             destination,
-            snapshot
+            snapshot,
+            status: 'pending',
         };
-
         this.sessionJournal.push(entry);
+        await this._journalWriteLine(entry);
+        return entry;
+    }
 
-        // Persistent Journaling (v3.5)
-        try {
-            let diskJournal = [];
-            if (fssync.existsSync(this.options.journalPath)) {
-                diskJournal = JSON.parse(fssync.readFileSync(this.options.journalPath, 'utf8'));
-            }
-            diskJournal.push(entry);
-            // Save last 1000 ops globally
-            fssync.writeFileSync(this.options.journalPath, JSON.stringify(diskJournal.slice(-1000), null, 2));
-        } catch (err) {
-            console.error(`[FAIL] Disk Journal write failed: ${err.message}`);
-        }
+    async _journalDone(id) {
+        await this._journalWriteLine({ id, status: 'done', completedAt: new Date().toISOString() });
     }
 
     /** ------------------------
      * Rollback
      * -------------------------*/
     async rollback() {
-        // Use session journal if available, otherwise try to load from disk
-        let reversed = [...this.sessionJournal].reverse();
-        
-        if (reversed.length === 0 && fssync.existsSync(this.options.journalPath)) {
-            console.log(`[SYS] Session journal empty. Attempting disk rollback...`);
-            const diskJournal = JSON.parse(fssync.readFileSync(this.options.journalPath, 'utf8'));
-            reversed = diskJournal.reverse();
+        const entries = new Map();
+        const done = new Set();
+
+        if (fssync.existsSync(this.options.journalPath)) {
+            const lines = fssync.readFileSync(this.options.journalPath, 'utf8').split('\n');
+            for (const line of lines) {
+                if (!line.trim()) continue;
+                try {
+                    const rec = JSON.parse(line);
+                    if (rec.status === 'pending') entries.set(rec.id, rec);
+                    if (rec.status === 'done')    done.add(rec.id);
+                } catch { /* skip malformed lines */ }
+            }
+        }
+
+        // Add session-only pending entries not yet on disk
+        for (const e of this.sessionJournal) {
+            if (!entries.has(e.id)) entries.set(e.id, e);
         }
 
-        console.log(`[SYS] Rolling back ${reversed.length} operations...`);
+        // Reverse-order rollback of moves that never completed
+        const toRollback = [...entries.values()]
+            .filter(e => !done.has(e.id))
+            .sort((a, b) => b.timestamp.localeCompare(a.timestamp));
+
+        console.log(`[SYS] Rolling back ${toRollback.length} incomplete operations...`);
 
-        for (const entry of reversed) {
+        for (const entry of toRollback) {
             try {
-                if (entry.action === 'move') {
-                    if (fssync.existsSync(entry.destination)) {
-                        await fs.rename(entry.destination, entry.source);
-                    }
-                } else if (entry.action === 'delete') {
-                    if (fssync.existsSync(entry.destination)) {
-                        await fs.rename(entry.destination, entry.source);
-                    }
+                if (fssync.existsSync(entry.destination)) {
+                    await fs.rename(entry.destination, entry.source);
+                    await this._journalWriteLine({ id: entry.id, status: 'rolled-back', rolledBackAt: new Date().toISOString() });
                 }
             } catch (err) {
                 console.error(`[FAIL] Rollback failed for ${entry.source}: ${err.message}`);
@@ -188,7 +212,7 @@ class FileMayorFS {
         }
 
         this.sessionJournal = [];
-        console.log(`[SYS] Rollback complete.`);
+        console.log('[SYS] Rollback complete.');
     }
 
     getJournal() {
@@ -196,4 +220,52 @@ class FileMayorFS {
     }
 }
 
-module.exports = FileMayorFS;
+const JOURNAL_PATH = path.join(os.homedir(), '.filemayor-master-journal.ndjson');
+
+/**
+ * Standalone rollback function that reads the master journal on disk
+ * and reverses all completed operations (status === 'done').
+ * Returns { reversed: Array<entry>, count: number }.
+ */
+async function rollback(journalPath) {
+    const entries = new Map();
+    const done = new Set();
+
+    if (fssync.existsSync(journalPath)) {
+        const lines = fssync.readFileSync(journalPath, 'utf8').split('\n');
+        for (const line of lines) {
+            if (!line.trim()) continue;
+            try {
+                const rec = JSON.parse(line);
+                if (rec.status === 'pending') entries.set(rec.id, rec);
+                if (rec.status === 'done')    done.add(rec.id);
+            } catch { /* skip malformed lines */ }
+        }
+    }
+
+    // Rollback moves that completed successfully (status === 'done')
+    const toRollback = [...entries.values()]
+        .filter(e => done.has(e.id))
+        .sort((a, b) => b.timestamp.localeCompare(a.timestamp));
+
+    const reversed = [];
+    for (const entry of toRollback) {
+        try {
+            if (fssync.existsSync(entry.destination)) {
+                await fs.rename(entry.destination, entry.source);
+                fssync.appendFileSync(journalPath,
+                    JSON.stringify({ id: entry.id, status: 'rolled-back', rolledBackAt: new Date().toISOString() }) + '\n',
+                    'utf8');
+                reversed.push(entry);
+            }
+        } catch (err) {
+            console.error(`[FAIL] Rollback failed for ${entry.source}: ${err.message}`);
+        }
+    }
+
+    return { reversed, count: reversed.length };
+}
+
+module.exports = FileMayorFS;
+module.exports.JOURNAL_PATH = JOURNAL_PATH;
+module.exports.rollback = rollback;

package/core/index.js

@@ -1,135 +1,135 @@
-#!/usr/bin/env node
-
-/**
- * ═══════════════════════════════════════════════════════════════════
- * FILEMAYOR CORE — INDEX (Barrel Export)
- * Unified entry point for all core modules
- * ═══════════════════════════════════════════════════════════════════
- */
-
-'use strict';
-
-const scanner = require('./scanner');
-const organizer = require('./organizer');
-const IntentInterpreter = require('./intent-interpreter');
-const FileMayorFS = require('./fs-abstraction');
-const cleaner = require('./cleaner');
-const watcher = require('./watcher');
-const config = require('./config');
-const reporter = require('./reporter');
-const categories = require('./categories');
-const security = require('./security');
-const sopParser = require('./sop-parser');
-const analyzer = require('./analyzer');
-const license = require('./license');
-const ExplainEngine = require('./engine/explain-engine');
-const CureEngine = require('./engine/cure-engine');
-const ApplyEngine = require('./engine/apply-engine');
-const PreviewEngine = require('./engine/preview-engine');
-const DedupeEngine = require('./engine/dedupe-engine');
-const MetadataStore = require('./metadata-store');
-const strategist = require('./ai/strategist');
-const sentry = require('./ai/sentry');
-const planner = require('./ai/planner');
-const validator = require('./ai/validator');
-const { FileMayorJailer, enforceUserSpace } = require('./jailer');
-const Vault = require('./vault');
-const LogicGuardrail = require('./guardrail');
-const { initEmergencyHalt, updateJournalRef, clearEmergencyHalt } = require('./emergency-halt');
-
-module.exports = {
-    // Scanner
-    Scanner: scanner.Scanner,
-    scan: scanner.scan,
-    scanByCategory: scanner.scanByCategory,
-    scanSummary: scanner.scanSummary,
-    formatBytes: scanner.formatBytes,
-    analyzeDirectory: analyzer.analyzeDirectory,
-
-    // Organizer
-    organize: organizer.organize,
-    generatePlan: organizer.generatePlan,
-    executePlan: organizer.executePlan,
-    rollback: organizer.rollback,
-    loadJournal: organizer.loadJournal,
-    NAMING_CONVENTIONS: organizer.NAMING_CONVENTIONS,
-
-    // Intent Interpreter
-    IntentInterpreter: IntentInterpreter,
-
-    // FS Abstraction
-    FileMayorFS: FileMayorFS,
-
-    // Cleaner
-    Cleaner: cleaner.Cleaner,
-    findJunk: cleaner.findJunk,
-    deleteJunk: cleaner.deleteJunk,
-    clean: cleaner.clean,
-    JUNK_CATEGORIES: cleaner.JUNK_CATEGORIES,
-
-    // Watcher
-    FileWatcher: watcher.FileWatcher,
-
-    // Config
-    loadConfig: config.loadConfig,
-    findConfigFile: config.findConfigFile,
-    createConfigFile: config.createConfigFile,
-    generateTemplate: config.generateTemplate,
-    validateConfig: config.validateConfig,
-
-    // Reporter
-    reporter,
-
-    // Categories
-    categorize: categories.categorize,
-    getCategories: categories.getCategories,
-    mergeCategories: categories.mergeCategories,
-    DEFAULT_CATEGORIES: categories.DEFAULT_CATEGORIES,
-
-    // Security
-    validatePath: security.validatePath,
-    isFileSafe: security.isFileSafe,
-    isDirSafe: security.isDirSafe,
-    sanitizeFilename: security.sanitizeFilename,
-    checkPermissions: security.checkPermissions,
-
-    // SOP Parser
-    parseSOP: sopParser.parseSOP,
-    parseRuleBased: sopParser.parseRuleBased,
-    rulesToConfig: sopParser.rulesToConfig,
-    FILE_TYPE_ALIASES: sopParser.FILE_TYPE_ALIASES,
-
-    // License
-    activateLicense: license.activateLicense,
-    deactivateLicense: license.deactivateLicense,
-    getLicenseInfo: license.getLicenseInfo,
-    checkProFeature: license.checkProFeature,
-    checkBulkLimit: license.checkBulkLimit,
-    hasFeature: license.hasFeature,
-
-    // Intent Agents
-    IntentStrategist: strategist,
-    MetadataSentry: sentry,
-    CurativePlanner: planner,
-    SecurityArchitect: validator,
-
-    // Engines
-    ExplainEngine,
-    CureEngine,
-    ApplyEngine,
-    PreviewEngine,
-    DedupeEngine,
-    MetadataStore,
-
-    // Hardened Runtime
-    FileMayorJailer,
-    enforceUserSpace,
-    Vault,
-    LogicGuardrail,
-    initEmergencyHalt,
-    updateJournalRef,
-    clearEmergencyHalt,
-
-    // Version
-    VERSION: require('../package.json').version || '2.0.0'
-};
+#!/usr/bin/env node
+
+/**
+ * ═══════════════════════════════════════════════════════════════════
+ * FILEMAYOR CORE — INDEX (Barrel Export)
+ * Unified entry point for all core modules
+ * ═══════════════════════════════════════════════════════════════════
+ */
+
+'use strict';
+
+const scanner = require('./scanner');
+const organizer = require('./organizer');
+const IntentInterpreter = require('./intent-interpreter');
+const FileMayorFS = require('./fs-abstraction');
+const cleaner = require('./cleaner');
+const watcher = require('./watcher');
+const config = require('./config');
+const reporter = require('./reporter');
+const categories = require('./categories');
+const security = require('./security');
+const sopParser = require('./sop-parser');
+const analyzer = require('./analyzer');
+const license = require('./license');
+const ExplainEngine = require('./engine/explain-engine');
+const CureEngine = require('./engine/cure-engine');
+const ApplyEngine = require('./engine/apply-engine');
+const PreviewEngine = require('./engine/preview-engine');
+const DedupeEngine = require('./engine/dedupe-engine');
+const MetadataStore = require('./metadata-store');
+const strategist = require('./ai/strategist');
+const sentry = require('./ai/sentry');
+const planner = require('./ai/planner');
+const validator = require('./ai/validator');
+const { FileMayorJailer, enforceUserSpace } = require('./jailer');
+const Vault = require('./vault');
+const LogicGuardrail = require('./guardrail');
+const { initEmergencyHalt, updateJournalRef, clearEmergencyHalt } = require('./emergency-halt');
+
+module.exports = {
+    // Scanner
+    Scanner: scanner.Scanner,
+    scan: scanner.scan,
+    scanByCategory: scanner.scanByCategory,
+    scanSummary: scanner.scanSummary,
+    formatBytes: scanner.formatBytes,
+    analyzeDirectory: analyzer.analyzeDirectory,
+
+    // Organizer
+    organize: organizer.organize,
+    generatePlan: organizer.generatePlan,
+    executePlan: organizer.executePlan,
+    rollback: organizer.rollback,
+    loadJournal: organizer.loadJournal,
+    NAMING_CONVENTIONS: organizer.NAMING_CONVENTIONS,
+
+    // Intent Interpreter
+    IntentInterpreter: IntentInterpreter,
+
+    // FS Abstraction
+    FileMayorFS: FileMayorFS,
+
+    // Cleaner
+    Cleaner: cleaner.Cleaner,
+    findJunk: cleaner.findJunk,
+    deleteJunk: cleaner.deleteJunk,
+    clean: cleaner.clean,
+    JUNK_CATEGORIES: cleaner.JUNK_CATEGORIES,
+
+    // Watcher
+    FileWatcher: watcher.FileWatcher,
+
+    // Config
+    loadConfig: config.loadConfig,
+    findConfigFile: config.findConfigFile,
+    createConfigFile: config.createConfigFile,
+    generateTemplate: config.generateTemplate,
+    validateConfig: config.validateConfig,
+
+    // Reporter
+    reporter,
+
+    // Categories
+    categorize: categories.categorize,
+    getCategories: categories.getCategories,
+    mergeCategories: categories.mergeCategories,
+    DEFAULT_CATEGORIES: categories.DEFAULT_CATEGORIES,
+
+    // Security
+    validatePath: security.validatePath,
+    isFileSafe: security.isFileSafe,
+    isDirSafe: security.isDirSafe,
+    sanitizeFilename: security.sanitizeFilename,
+    checkPermissions: security.checkPermissions,
+
+    // SOP Parser
+    parseSOP: sopParser.parseSOP,
+    parseRuleBased: sopParser.parseRuleBased,
+    rulesToConfig: sopParser.rulesToConfig,
+    FILE_TYPE_ALIASES: sopParser.FILE_TYPE_ALIASES,
+
+    // License
+    activateLicense: license.activateLicense,
+    deactivateLicense: license.deactivateLicense,
+    getLicenseInfo: license.getLicenseInfo,
+    checkProFeature: license.checkProFeature,
+    checkBulkLimit: license.checkBulkLimit,
+    hasFeature: license.hasFeature,
+
+    // Intent Agents
+    IntentStrategist: strategist,
+    MetadataSentry: sentry,
+    CurativePlanner: planner,
+    SecurityArchitect: validator,
+
+    // Engines
+    ExplainEngine,
+    CureEngine,
+    ApplyEngine,
+    PreviewEngine,
+    DedupeEngine,
+    MetadataStore,
+
+    // Hardened Runtime
+    FileMayorJailer,
+    enforceUserSpace,
+    Vault,
+    LogicGuardrail,
+    initEmergencyHalt,
+    updateJournalRef,
+    clearEmergencyHalt,
+
+    // Version
+    VERSION: require('../package.json').version || '2.0.0'
+};