Critical Fix: Resolve 401 'Subject not found' loop, stabilize HF Space persistence, and improve session recovery

backend/controllers/users.js

@@ -51,6 +51,11 @@ exports.updatePreferences = asyncHandler(async (req, res, next) => {
 exports.getProfile = asyncHandler(async (req, res, next) => {
   const user = await User.findById(req.user.id);
   
+  if (!user) {
+    res.clearCookie('token');
+    return next(new ErrorResponse('Not authorized', 401));
+  }
+  
   const profile = {
     name: user.name,
     role: user.role,

backend/middleware/auth.js

@@ -25,11 +25,13 @@ exports.protect = asyncHandler(async (req, res, next) => {
     req.user = await User.findById(decoded.id);
     
     if (!req.user) {
-      return next(new ErrorResponse('Not authorized: Subject not found in archive', 401));
+      res.clearCookie('token');
+      return next(new ErrorResponse('Not authorized: Subject not found in archive. Please log in again.', 401));
     }
     next();
   } catch (err) {
     console.log(`AUTH_FAILURE: Token verification failed (${err.message})`);
+    res.clearCookie('token');
     return next(new ErrorResponse('Not authorized: Link signature invalid', 401));
   }
 });

backend/models/Announcement.js

@@ -1,14 +1,22 @@
 const { db } = require('../db');
 
 class Announcement {
-  static async findOne(query) {
+  static findOne(query) {
     return {
-      sort: (sortQuery) => new Promise((resolve, reject) => {
-        db.announcements.find(query).sort(sortQuery).limit(1).exec((err, docs) => {
-          if (err) reject(err);
-          else resolve(docs[0] || null);
-        });
-      })
+      sort: function(sortQuery) {
+        this._sort = sortQuery;
+        return this;
+      },
+      then: function(resolve, reject) {
+        return new Promise((res, rej) => {
+          let q = db.announcements.find(query);
+          if (this._sort) q = q.sort(this._sort);
+          q.limit(1).exec((err, docs) => {
+            if (err) rej(err);
+            else res(docs[0] || null);
+          });
+        }).then(resolve, reject);
+      }
     };
   }
 
@@ -23,4 +31,4 @@ class Announcement {
   }
 }
 
-module.exports = Announcement;
+module.exports = Announcement;

backend/models/Message.js

@@ -1,23 +1,29 @@
 const { db } = require('../db');
 
 class Message {
-  static async find(query) {
-    return {
-      sort: (sortQuery) => ({
-        limit: (limitNum) => new Promise((resolve, reject) => {
-          db.messages.find(query).sort(sortQuery).limit(limitNum).exec((err, docs) => {
-            if (err) reject(err);
-            else resolve(docs);
+  static find(query) {
+    const chain = {
+      sort: function(sortQuery) {
+        this._sort = sortQuery;
+        return this;
+      },
+      limit: function(limitNum) {
+        this._limit = limitNum;
+        return this;
+      },
+      then: function(resolve, reject) {
+        return new Promise((res, rej) => {
+          let q = db.messages.find(query);
+          if (this._sort) q = q.sort(this._sort);
+          if (this._limit) q = q.limit(this._limit);
+          q.exec((err, docs) => {
+            if (err) rej(err);
+            else res(docs);
           });
-        }),
-        exec: () => new Promise((resolve, reject) => {
-          db.messages.find(query).sort(sortQuery).exec((err, docs) => {
-            if (err) reject(err);
-            else resolve(docs);
-          });
-        })
-      })
+        }).then(resolve, reject);
+      }
     };
+    return chain;
   }
 
   static async create(msgData) {
@@ -40,4 +46,4 @@ class Message {
   }
 }
 
-module.exports = Message;
+module.exports = Message;

backend/models/User.js

@@ -8,13 +8,24 @@ class User {
     Object.assign(this, userData);
   }
 
-  static async findOne(query) {
-    return new Promise((resolve, reject) => {
-      db.users.findOne(query, (err, doc) => {
-        if (err) reject(err);
-        else resolve(doc ? new User(doc) : null);
-      });
-    });
+  static findOne(query) {
+    const chain = {
+      select: function(fields) {
+        return this;
+      },
+      then: function(resolve, reject) {
+        return new Promise((res, rej) => {
+          db.users.findOne(query, (err, doc) => {
+            if (err) rej(err);
+            else res(doc ? new User(doc) : null);
+          });
+        }).then(resolve, reject);
+      },
+      catch: function(reject) {
+        return this.then(null, reject);
+      }
+    };
+    return chain;
   }
 
   static async findById(id) {
@@ -35,7 +46,6 @@ class User {
     userData.createdAt = userData.createdAt || new Date();
     userData.role = userData.role || 'user';
     
-    // Ownership check
     const owners = ['johanvoncd7@gmail.com', 'codexai@mightysmp.online'];
     if (owners.includes(userData.email)) {
       userData.role = 'owner';
@@ -86,24 +96,6 @@ class User {
       });
     });
   }
-
-  // Chainable .select implementation for compatibility
-  static findOne(query) {
-    return {
-      select: (fields) => new Promise((resolve, reject) => {
-        db.users.findOne(query, (err, doc) => {
-          if (err) reject(err);
-          else resolve(doc ? new User(doc) : null);
-        });
-      }),
-      then: (resolve, reject) => {
-        db.users.findOne(query, (err, doc) => {
-          if (err) { if (reject) reject(err); }
-          else resolve(doc ? new User(doc) : null);
-        });
-      }
-    };
-  }
 }
 
 module.exports = User;

backend/public/chat.html

@@ -307,6 +307,13 @@
             input.value = ''; input.style.height = 'auto';
             try {
                 const res = await fetch(`${API_BASE}/api/ai/chat`, { method: 'POST', headers: { 'Authorization': `Bearer ${token}` }, body: fd });
+                
+                if (res.status === 401) {
+                    localStorage.removeItem('token');
+                    window.location.href = '/auth?error=SESSION_EXPIRED';
+                    return;
+                }
+
                 const reader = res.body.getReader(); const decoder = new TextDecoder();
                 let aiNode = appendMessage('ai', '', activeModel); let fullText = "";
                 while (true) {

backend/services/persistenceService.js

@@ -26,7 +26,13 @@ exports.syncToCloud = async () => {
     try {
       execSync(`git add backend/data/*.db`, { cwd: rootDir });
       execSync(`git ${gitIdent} commit -m "Neural Archive Sync: [$(date)]"`, { cwd: rootDir });
-      execSync(`git push "${remoteUrl}" main`, { cwd: rootDir });
+      
+      if (process.env.SPACE_ID || process.env.HF_TOKEN) {
+        console.log('[PERSISTENCE] HF_SPACE detected. Skipping remote push to prevent restart loop.');
+      } else {
+        execSync(`git push "${remoteUrl}" main`, { cwd: rootDir });
+      }
+      
       console.log('[PERSISTENCE] Cloud Sync: SUCCESS ✅');
     } catch (gitErr) {
       if (gitErr.message.includes('nothing to commit')) {