.

dispatcher.py

@@ -755,7 +755,16 @@ class SessionManager:
             # Notify client that activity was detected and warnings are reset
             if warning_reset:
                 try:
-                    await session.websocket.send_json({"type": "activity_reset"})
+                    # Include current session time remaining if session limit is active
+                    message = {"type": "activity_reset"}
+                    if session.max_session_time and session.session_limit_start_time:
+                        elapsed = time.time() - session.session_limit_start_time
+                        remaining = max(0, session.max_session_time - elapsed)
+                        if remaining > 0:
+                            message["session_time_remaining"] = remaining
+                            message["queue_size"] = len(self.session_queue)
+                    
+                    await session.websocket.send_json(message)
                     logger.info(f"Activity reset message sent to session {session_id}")
                 except Exception as e:
                     logger.error(f"Failed to send activity reset to session {session_id}: {e}")

static/index.html

@@ -279,6 +279,13 @@
                 } else if (data.type === "activity_reset") {
                     console.log("Server detected user activity, resetting timeout");
                     stopTimeoutCountdown();
+                    
+                    // If there's still a session time limit active, restore that countdown
+                    if (data.session_time_remaining && data.session_time_remaining > 0) {
+                        console.log(`Restoring session countdown: ${data.session_time_remaining} seconds remaining`);
+                        setTimeoutMessage(`⏰ Other users waiting. Time remaining: <span id="timeoutCountdown">${Math.ceil(data.session_time_remaining)}</span> seconds.`);
+                        startTimeoutCountdown(Math.ceil(data.session_time_remaining), true); // true = hide stay connected button
+                    }
                 } else if (data.type === "queue_update") {
                     console.log(`Queue update: Position ${data.position}/${data.total_waiting}, wait: ${data.maximum_wait_seconds.toFixed(1)} seconds`);
                     const waitSeconds = Math.ceil(data.maximum_wait_seconds);