@cccarv82/freya 2.6.1 → 2.7.1

package/cli/auto-update.js

@@ -0,0 +1,134 @@
+/**
+ * auto-update.js
+ * Transparently keeps workspace scripts and dependencies in sync 
+ * with the installed Freya version.
+ * 
+ * Called automatically on every `freya` CLI invocation.
+ * - Compares installed Freya version vs. workspace's last-synced version
+ * - If different, runs initWorkspace to copy updated scripts
+ * - Runs `npm install` if dependencies changed
+ * - Writes a .freya-version marker so it only runs once per upgrade
+ */
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+function getInstalledVersion() {
+    try {
+        const pkg = require('../package.json');
+        return pkg.version || '0.0.0';
+    } catch {
+        return '0.0.0';
+    }
+}
+
+function getWorkspaceVersion(workspaceDir) {
+    const markerPath = path.join(workspaceDir, '.freya-version');
+    try {
+        return fs.readFileSync(markerPath, 'utf8').trim();
+    } catch {
+        return null;
+    }
+}
+
+function setWorkspaceVersion(workspaceDir, version) {
+    const markerPath = path.join(workspaceDir, '.freya-version');
+    try {
+        fs.writeFileSync(markerPath, version + '\n', 'utf8');
+    } catch {
+        // non-fatal
+    }
+}
+
+function needsNpmInstall(workspaceDir) {
+    // Check if sql.js is installed in the workspace's node_modules
+    const sqlJsPath = path.join(workspaceDir, 'node_modules', 'sql.js');
+    try {
+        fs.accessSync(sqlJsPath);
+        return false;
+    } catch {
+        return true;
+    }
+}
+
+function runNpmInstall(workspaceDir) {
+    try {
+        console.log('[FREYA] Installing workspace dependencies...');
+        const opts = {
+            cwd: workspaceDir,
+            stdio: 'pipe',
+            timeout: 120000, // 2 min max
+            env: { ...process.env }
+        };
+
+        if (process.platform === 'win32') {
+            execSync('npm install --no-audit --no-fund', opts);
+        } else {
+            execSync('npm install --no-audit --no-fund', opts);
+        }
+        console.log('[FREYA] Dependencies installed successfully.');
+        return true;
+    } catch (err) {
+        console.error('[FREYA] Warning: npm install failed:', err.message || String(err));
+        return false;
+    }
+}
+
+/**
+ * Auto-update the workspace if the installed Freya version is newer.
+ * This is designed to be silent and non-disruptive.
+ * 
+ * @param {string} workspaceDir - Resolved absolute path to the workspace
+ * @returns {Promise<{updated: boolean, version: string}>}
+ */
+async function autoUpdate(workspaceDir) {
+    const installedVersion = getInstalledVersion();
+    const workspaceVersion = getWorkspaceVersion(workspaceDir);
+
+    // Already in sync
+    if (workspaceVersion === installedVersion) {
+        return { updated: false, version: installedVersion };
+    }
+
+    // Workspace doesn't look like a Freya workspace (no scripts/ dir)
+    const scriptsDir = path.join(workspaceDir, 'scripts');
+    try {
+        fs.accessSync(scriptsDir);
+    } catch {
+        // Not a workspace, skip
+        return { updated: false, version: installedVersion };
+    }
+
+    console.log(`[FREYA] Updating workspace from ${workspaceVersion || 'unknown'} → ${installedVersion}...`);
+
+    try {
+        // Use initWorkspace to sync templates (scripts, etc.)
+        const { initWorkspace } = require('./init');
+        await initWorkspace({
+            targetDir: workspaceDir,
+            force: false,  // Don't force non-script files
+            forceData: false,
+            forceLogs: false
+        });
+
+        // Check if npm install is needed
+        if (needsNpmInstall(workspaceDir)) {
+            runNpmInstall(workspaceDir);
+        }
+
+        // Mark workspace as up-to-date
+        setWorkspaceVersion(workspaceDir, installedVersion);
+        console.log(`[FREYA] Workspace updated to v${installedVersion} ✓`);
+
+        return { updated: true, version: installedVersion };
+    } catch (err) {
+        console.error('[FREYA] Warning: auto-update failed:', err.message || String(err));
+        // Non-fatal — don't block the user
+        return { updated: false, version: installedVersion, error: err.message };
+    }
+}
+
+module.exports = { autoUpdate, getInstalledVersion };

package/cli/web.js

@@ -2238,6 +2238,14 @@ function seedDevWorkspace(workspaceDir) {
 
 async function cmdWeb({ port, dir, open, dev }) {
   await ready;
+
+  // Auto-update workspace scripts/deps if Freya version changed
+  try {
+    const { autoUpdate } = require('./auto-update');
+    const wsDir = normalizeWorkspaceDir(dir || './freya');
+    await autoUpdate(wsDir);
+  } catch { /* non-fatal */ }
+
   const host = '127.0.0.1';
 
   const server = http.createServer(async (req, res) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cccarv82/freya",
-  "version": "2.6.1",
+  "version": "2.7.1",
   "description": "Personal AI Assistant with local-first persistence",
   "scripts": {
     "health": "node scripts/validate-data.js && node scripts/validate-structure.js",

package/scripts/lib/DataLayer.js

@@ -72,7 +72,10 @@ class PreparedStatement {
     const db = this._wrapper._db;
     db.run(this._sql, this._flattenParams(params));
     const changes = db.getRowsModified();
-    this._wrapper._save();
+    // Only save to disk if NOT inside a transaction (save happens at COMMIT)
+    if (!this._wrapper._inTransaction) {
+      this._wrapper._save();
+    }
     return { changes };
   }
 
@@ -92,7 +95,7 @@ class SqlJsDatabase {
   constructor(sqlJsDb, filePath) {
     this._db = sqlJsDb;
     this._filePath = filePath;
-    this._saveScheduled = false;
+    this._inTransaction = false;
   }
 
   /**
@@ -126,7 +129,9 @@ class SqlJsDatabase {
    */
   exec(sql) {
     this._db.run(sql);
-    this._save();
+    if (!this._inTransaction) {
+      this._save();
+    }
   }
 
   /**
@@ -144,13 +149,16 @@ class SqlJsDatabase {
   transaction(fn) {
     const self = this;
     return function (...args) {
+      self._inTransaction = true;
       self._db.run('BEGIN TRANSACTION');
       try {
         const result = fn(...args);
         self._db.run('COMMIT');
+        self._inTransaction = false;
         self._save();
         return result;
       } catch (e) {
+        self._inTransaction = false;
         try { self._db.run('ROLLBACK'); } catch { /* already rolled back */ }
         throw e;
       }
@@ -192,6 +200,40 @@ class DataLayer {
     const initSqlJs = require('sql.js');
     const SQL = await initSqlJs();
 
+    // --- WAL consolidation (migration from better-sqlite3) ---
+    // better-sqlite3 used WAL mode, which may leave a -wal file with uncommitted data.
+    // sql.js cannot read WAL files directly, so we need to checkpoint first.
+    const walPath = this._dbPath + '-wal';
+    const shmPath = this._dbPath + '-shm';
+    if (fs.existsSync(this._dbPath) && fs.existsSync(walPath)) {
+      try {
+        console.log('[DataLayer] Consolidating WAL file from previous better-sqlite3 usage...');
+        // Open the database including the WAL data
+        const fileBuffer = fs.readFileSync(this._dbPath);
+        const tempDb = new SQL.Database(fileBuffer);
+
+        // Try to checkpoint the WAL (merge pending writes into main file)
+        try { tempDb.run('PRAGMA wal_checkpoint(TRUNCATE)'); } catch { /* may not work in WASM */ }
+
+        // Switch to DELETE journal mode (fully compatible with sql.js)
+        try { tempDb.run('PRAGMA journal_mode = DELETE'); } catch { /* ignore */ }
+
+        // Export the consolidated database and save it
+        const consolidated = tempDb.export();
+        fs.writeFileSync(this._dbPath, Buffer.from(consolidated));
+        tempDb.close();
+
+        // Clean up WAL/SHM files
+        try { fs.unlinkSync(walPath); } catch { /* ignore */ }
+        try { fs.unlinkSync(shmPath); } catch { /* ignore */ }
+
+        console.log('[DataLayer] WAL consolidation complete.');
+      } catch (err) {
+        console.error('[DataLayer] Warning: WAL consolidation failed:', err.message);
+        // Continue anyway — the main .sqlite file may still be usable
+      }
+    }
+
     // Load existing database from disk, or create new one
     let sqlJsDb;
     if (fs.existsSync(this._dbPath)) {
@@ -206,8 +248,8 @@ class DataLayer {
   }
 
   _initSchema() {
-    // WAL mode may not work in WASM — we try, but it's silently ignored if unsupported
-    this.db.pragma('journal_mode = WAL');
+    // Use DELETE journal mode (compatible with sql.js WASM)
+    this.db.pragma('journal_mode = DELETE');
 
     this.db.exec(`
       CREATE TABLE IF NOT EXISTS projects (

package/templates/base/scripts/lib/DataLayer.js

@@ -72,7 +72,10 @@ class PreparedStatement {
     const db = this._wrapper._db;
     db.run(this._sql, this._flattenParams(params));
     const changes = db.getRowsModified();
-    this._wrapper._save();
+    // Only save to disk if NOT inside a transaction (save happens at COMMIT)
+    if (!this._wrapper._inTransaction) {
+      this._wrapper._save();
+    }
     return { changes };
   }
 
@@ -92,7 +95,7 @@ class SqlJsDatabase {
   constructor(sqlJsDb, filePath) {
     this._db = sqlJsDb;
     this._filePath = filePath;
-    this._saveScheduled = false;
+    this._inTransaction = false;
   }
 
   /**
@@ -126,7 +129,9 @@ class SqlJsDatabase {
    */
   exec(sql) {
     this._db.run(sql);
-    this._save();
+    if (!this._inTransaction) {
+      this._save();
+    }
   }
 
   /**
@@ -144,13 +149,16 @@ class SqlJsDatabase {
   transaction(fn) {
     const self = this;
     return function (...args) {
+      self._inTransaction = true;
       self._db.run('BEGIN TRANSACTION');
       try {
         const result = fn(...args);
         self._db.run('COMMIT');
+        self._inTransaction = false;
         self._save();
         return result;
       } catch (e) {
+        self._inTransaction = false;
         try { self._db.run('ROLLBACK'); } catch { /* already rolled back */ }
         throw e;
       }
@@ -192,6 +200,40 @@ class DataLayer {
     const initSqlJs = require('sql.js');
     const SQL = await initSqlJs();
 
+    // --- WAL consolidation (migration from better-sqlite3) ---
+    // better-sqlite3 used WAL mode, which may leave a -wal file with uncommitted data.
+    // sql.js cannot read WAL files directly, so we need to checkpoint first.
+    const walPath = this._dbPath + '-wal';
+    const shmPath = this._dbPath + '-shm';
+    if (fs.existsSync(this._dbPath) && fs.existsSync(walPath)) {
+      try {
+        console.log('[DataLayer] Consolidating WAL file from previous better-sqlite3 usage...');
+        // Open the database including the WAL data
+        const fileBuffer = fs.readFileSync(this._dbPath);
+        const tempDb = new SQL.Database(fileBuffer);
+
+        // Try to checkpoint the WAL (merge pending writes into main file)
+        try { tempDb.run('PRAGMA wal_checkpoint(TRUNCATE)'); } catch { /* may not work in WASM */ }
+
+        // Switch to DELETE journal mode (fully compatible with sql.js)
+        try { tempDb.run('PRAGMA journal_mode = DELETE'); } catch { /* ignore */ }
+
+        // Export the consolidated database and save it
+        const consolidated = tempDb.export();
+        fs.writeFileSync(this._dbPath, Buffer.from(consolidated));
+        tempDb.close();
+
+        // Clean up WAL/SHM files
+        try { fs.unlinkSync(walPath); } catch { /* ignore */ }
+        try { fs.unlinkSync(shmPath); } catch { /* ignore */ }
+
+        console.log('[DataLayer] WAL consolidation complete.');
+      } catch (err) {
+        console.error('[DataLayer] Warning: WAL consolidation failed:', err.message);
+        // Continue anyway — the main .sqlite file may still be usable
+      }
+    }
+
     // Load existing database from disk, or create new one
     let sqlJsDb;
     if (fs.existsSync(this._dbPath)) {
@@ -206,8 +248,8 @@ class DataLayer {
   }
 
   _initSchema() {
-    // WAL mode may not work in WASM — we try, but it's silently ignored if unsupported
-    this.db.pragma('journal_mode = WAL');
+    // Use DELETE journal mode (compatible with sql.js WASM)
+    this.db.pragma('journal_mode = DELETE');
 
     this.db.exec(`
       CREATE TABLE IF NOT EXISTS projects (