@@ -174,53 +174,25 @@ def validate_session(self, token):
 
             session = sessions[0]
 
-            # AUTO-LOGOUT: Check for 1-hour inactivity timeout
-            last_activity = session.get("last_activity")
-
-            # DEBUG LOGGING - Remove after debugging
-            current_time = datetime.now()
-            logger.info(f"[SESSION-DEBUG] User: {session['username']}")
-            logger.info(f"[SESSION-DEBUG] Current time: {current_time} (type: {type(current_time)}, tz: {current_time.tzinfo})")
-            logger.info(f"[SESSION-DEBUG] Last activity raw: {last_activity} (type: {type(last_activity)})")
-
-            if last_activity:
-                original_last_activity = last_activity  # Store original for logging
-
-                # Handle both string and datetime types, ensuring timezone-naive comparison
-                if isinstance(last_activity, str):
-                    # Parse ISO format string and strip timezone info to match datetime.now()
-                    last_activity = datetime.fromisoformat(last_activity.replace("Z", "+00:00"))
-                    logger.info(f"[SESSION-DEBUG] Parsed from string: {last_activity} (tz: {last_activity.tzinfo})")
-                    # Convert to naive datetime by removing timezone info
-                    if last_activity.tzinfo is not None:
-                        last_activity = last_activity.replace(tzinfo=None)
-                        logger.info(f"[SESSION-DEBUG] After stripping timezone: {last_activity}")
-                elif isinstance(last_activity, datetime):
-                    logger.info(f"[SESSION-DEBUG] Already datetime: {last_activity} (tz: {last_activity.tzinfo})")
-                    # If datetime object has timezone, remove it for consistent comparison
-                    if last_activity.tzinfo is not None:
-                        last_activity = last_activity.replace(tzinfo=None)
-                        logger.info(f"[SESSION-DEBUG] After stripping timezone: {last_activity}")
-
-                # Both datetimes are now timezone-naive, safe to subtract
-                idle_duration = current_time - last_activity
-                INACTIVITY_TIMEOUT = timedelta(hours=1)  # 1 hour timeout
-
-                # DEBUG LOGGING
-                logger.info(f"[SESSION-DEBUG] Final last_activity: {last_activity} (tz: {last_activity.tzinfo})")
-                logger.info(f"[SESSION-DEBUG] Idle duration: {idle_duration} (seconds: {idle_duration.total_seconds()})")
-                logger.info(f"[SESSION-DEBUG] Timeout threshold: {INACTIVITY_TIMEOUT} (seconds: {INACTIVITY_TIMEOUT.total_seconds()})")
-                logger.info(f"[SESSION-DEBUG] Will logout? {idle_duration > INACTIVITY_TIMEOUT}")
-
-                if idle_duration > INACTIVITY_TIMEOUT:
-                    # Session expired due to inactivity
-                    logger.warning(f"[SESSION-TIMEOUT] User {session['username']} logged out due to inactivity")
-                    logger.warning(f"[SESSION-TIMEOUT] Idle duration: {idle_duration} > threshold: {INACTIVITY_TIMEOUT}")
-                    logger.warning(f"[SESSION-TIMEOUT] Last activity was: {original_last_activity}")
-                    self.logout(token)
-                    return None
-            else:
-                logger.warning(f"[SESSION-DEBUG] No last_activity found for user {session['username']}")
+            # AUTO-LOGOUT: TEMPORARILY DISABLED
+            #
+            # The auto-logout after 1 hour of inactivity has been temporarily disabled
+            # because users were getting logged out prematurely (5-6 minutes instead of 1 hour).
+            #
+            # Single-session enforcement (lines 89-102) is still ACTIVE and working correctly.
+            # Activity tracking (update_session_activity) is still ACTIVE for future debugging.
+            #
+            # Session still expires after 24 hours (checked at line 152 via expires_at column).
+            #
+            # TO RE-ENABLE AFTER FIXING:
+            # 1. Switch back to the feat/user-session branch (has the full implementation)
+            # 2. Review DEBUG_SESSION_TIMEOUT.md for debugging steps
+            # 3. Collect production logs to identify root cause
+            # 4. Fix the timezone/timing issue
+            # 5. Test thoroughly with debug logging
+            # 6. Merge the fix back
+            #
+            # Original code preserved in git history and feat/user-session branch
 
             # With RealDictCursor, this will always be a dict
             return {
@@ -644,54 +616,21 @@ def get_all_users_for_admin(self, admin_username):
     def cleanup_idle_sessions(self):
         """
         Cleanup sessions that have been idle for more than 1 hour.
-        This is called periodically by background job.
-        """
-        try:
-            INACTIVITY_TIMEOUT = timedelta(hours=1)  # 1 hour timeout
-            cutoff_time = datetime.now() - INACTIVITY_TIMEOUT
-
-            query = (
-                """
-                UPDATE sessions SET is_active = false
-                WHERE last_activity < %s AND is_active = true
-            """
-                if self.db.is_postgres
-                else """
-                UPDATE sessions SET is_active = 0
-                WHERE last_activity < ? AND is_active = 1
-            """
-            )
-
-            result = self.db.execute_query(query, (cutoff_time,))
+        TEMPORARILY DISABLED - Returns empty list.
 
-            # Get list of affected users to terminate their WebSocket connections
-            affected_query = (
-                """
-                SELECT DISTINCT u.username
-                FROM sessions s
-                JOIN users u ON s.user_id = u.id
-                WHERE s.last_activity < %s AND s.is_active = false
-            """
-                if self.db.is_postgres
-                else """
-                SELECT DISTINCT u.username
-                FROM sessions s
-                JOIN users u ON s.user_id = u.id
-                WHERE s.last_activity < ? AND s.is_active = 0
-            """
-            )
-
-            affected_users = self.db.execute_query(affected_query, (cutoff_time,))
-
-            if affected_users:
-                logger.info(f"Cleaned up {len(affected_users)} idle sessions")
-                return [user["username"] for user in affected_users]
+        This is called periodically by IdleSessionCleanupJob (every 5 minutes)
+        but does nothing until the auto-logout timeout issue is debugged and fixed.
 
-            return []
+        The background job will continue running but won't terminate any sessions.
 
-        except Exception as e:
-            logger.error(f"Error cleaning up idle sessions: {e}")
-            return []
+        TO RE-ENABLE AFTER FIXING:
+        1. Switch back to feat/user-session branch (has full implementation)
+        2. Debug and fix the timeout calculation issue
+        3. Test thoroughly with debug logging
+        4. Restore this method from git history
+        """
+        logger.debug("Idle session cleanup temporarily disabled (rollback)")
+        return []  # No users to cleanup
 
 
 # Background job for idle session cleanup