@cccarv82/freya 3.8.0 → 3.8.2

package/cli/retroactive-ingest.js

@@ -34,14 +34,16 @@ function run(cmd, args, cwd, extraEnv) {
     const env = extraEnv ? { ...process.env, ...extraEnv } : process.env;
     try {
       if (process.platform === 'win32') {
-        const escapedArgs = args.map(a => {
-          const escaped = String(a).replace(/'/g, "''");
-          return `'${escaped}'`;
-        });
-        const psCommand = `& '${cmd}' ${escapedArgs.join(' ')}`;
-        child = spawn('powershell.exe', [
-          '-NoLogo', '-Command', psCommand
-        ], { cwd, env, windowsHide: true });
+        // If we have a full path to the executable, use it directly with spawn
+        // (no shell needed — avoids PowerShell argument mangling).
+        // Only fall back to cmd.exe for bare command names.
+        if (path.isAbsolute(cmd) || cmd.includes('\\') || cmd.includes('/')) {
+          child = spawn(cmd, args, { cwd, env, windowsHide: true });
+        } else {
+          // Bare command name — use cmd.exe to resolve from PATH
+          const comspec = process.env.ComSpec || 'cmd.exe';
+          child = spawn(comspec, ['/d', '/s', '/c', cmd, ...args], { cwd, shell: false, env });
+        }
       } else {
         child = spawn(cmd, args, { cwd, shell: true, env });
       }

package/cli/web.js

@@ -971,17 +971,16 @@ function run(cmd, args, cwd, extraEnv, stdinData) {
 
     try {
       if (process.platform === 'win32') {
-        // Use PowerShell — fnm/nvm set PATH only in PowerShell profile,
-        // so cmd.exe (shell:true) can't find npm global .cmd shims like copilot.
-        // Do NOT use -NoProfile: the profile is what loads fnm/nvm PATH entries.
-        const escapedArgs = args.map(a => {
-          const escaped = String(a).replace(/'/g, "''");
-          return `'${escaped}'`;
-        });
-        const psCommand = `& '${cmd}' ${escapedArgs.join(' ')}`;
-        child = spawn('powershell.exe', [
-          '-NoLogo', '-Command', psCommand
-        ], { cwd, env, windowsHide: true });
+        // getCopilotCmd() resolves the full path via PowerShell/where.
+        // Once we have the full path, spawn directly — no shell needed.
+        // This avoids PowerShell argument mangling issues.
+        if (path.isAbsolute(cmd) || cmd.includes('\\') || cmd.includes('/')) {
+          child = spawn(cmd, args, { cwd, env, windowsHide: true });
+        } else {
+          // Bare command name — use cmd.exe to resolve from PATH
+          const comspec = process.env.ComSpec || 'cmd.exe';
+          child = spawn(comspec, ['/d', '/s', '/c', cmd, ...args], { cwd, shell: false, env });
+        }
       } else {
         child = spawn(cmd, args, { cwd, shell: true, env });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cccarv82/freya",
-  "version": "3.8.0",
+  "version": "3.8.2",
   "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

@@ -100,15 +100,37 @@ class SqlJsDatabase {
 
   /**
    * Persist the in-memory database to disk.
+   * Retries with backoff on EBUSY (OneDrive/cloud sync locking).
    */
   _save() {
     if (!this._filePath) return;
-    try {
-      const data = this._db.export();
-      const buffer = Buffer.from(data);
-      fs.writeFileSync(this._filePath, buffer);
-    } catch (err) {
-      console.error('[DataLayer] Failed to save database:', err.message);
+    const data = this._db.export();
+    const buffer = Buffer.from(data);
+    const maxRetries = 5;
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      try {
+        // Write to temp file + rename for atomic operation
+        const tmpPath = this._filePath + '.tmp';
+        fs.writeFileSync(tmpPath, buffer);
+        try {
+          fs.renameSync(tmpPath, this._filePath);
+        } catch (renameErr) {
+          // On Windows, rename can fail if target is locked; fall back to direct write
+          try { fs.unlinkSync(tmpPath); } catch { }
+          fs.writeFileSync(this._filePath, buffer);
+        }
+        return; // success
+      } catch (err) {
+        if ((err.code === 'EBUSY' || err.code === 'EPERM') && attempt < maxRetries) {
+          // Wait with exponential backoff: 100ms, 200ms, 400ms, 800ms, 1600ms
+          const delay = 100 * Math.pow(2, attempt);
+          const start = Date.now();
+          while (Date.now() - start < delay) { /* busy wait — sync context */ }
+          continue;
+        }
+        console.error('[DataLayer] Failed to save database:', err.message);
+        return;
+      }
     }
   }
 

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

@@ -100,15 +100,37 @@ class SqlJsDatabase {
 
   /**
    * Persist the in-memory database to disk.
+   * Retries with backoff on EBUSY (OneDrive/cloud sync locking).
    */
   _save() {
     if (!this._filePath) return;
-    try {
-      const data = this._db.export();
-      const buffer = Buffer.from(data);
-      fs.writeFileSync(this._filePath, buffer);
-    } catch (err) {
-      console.error('[DataLayer] Failed to save database:', err.message);
+    const data = this._db.export();
+    const buffer = Buffer.from(data);
+    const maxRetries = 5;
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      try {
+        // Write to temp file + rename for atomic operation
+        const tmpPath = this._filePath + '.tmp';
+        fs.writeFileSync(tmpPath, buffer);
+        try {
+          fs.renameSync(tmpPath, this._filePath);
+        } catch (renameErr) {
+          // On Windows, rename can fail if target is locked; fall back to direct write
+          try { fs.unlinkSync(tmpPath); } catch { }
+          fs.writeFileSync(this._filePath, buffer);
+        }
+        return; // success
+      } catch (err) {
+        if ((err.code === 'EBUSY' || err.code === 'EPERM') && attempt < maxRetries) {
+          // Wait with exponential backoff: 100ms, 200ms, 400ms, 800ms, 1600ms
+          const delay = 100 * Math.pow(2, attempt);
+          const start = Date.now();
+          while (Date.now() - start < delay) { /* busy wait — sync context */ }
+          continue;
+        }
+        console.error('[DataLayer] Failed to save database:', err.message);
+        return;
+      }
     }
   }