[bugfix] Fix watchdog.reset() race that silently dropped WebSocket

cancels on CI

xquery.execute(resetContext=true) calls watchdog.reset() after the
"evaluating"
signal is sent. On slow CI machines, sendText() blocks long enough for
the client
cancel roundtrip to complete: kill() sets terminate=true, then
watchdog.reset()
immediately clears it to false, dropping the cancel silently.

Fix: call watchdog.reset() manually before
registerQuery()/sendProgress(), then
pass resetContext=false to xquery.execute() so the internal reset is
skipped.
Add context.reset() to the outer finally block to cover what
resetContext=false
no longer handles in xquery.execute().

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: duncdrum

exist-core/src/main/java/org/exist/http/ws/QueryExecutor.java

@@ -103,8 +103,8 @@ public void execute(final Session wsSession, final EvalSession evalSession,
             sendProgress(wsSession, msg.id(), EvalProtocol.PHASE_COMPILING, 0,
                     System.currentTimeMillis() - startTime);
 
-            // Set timeout via watchdog
             final XQueryWatchDog watchDog = context.getWatchDog();
+            watchDog.reset(); // before signal: prevents execute() from clearing a concurrent kill() via its internal watchdog.reset()
             if (msg.maxExecutionTime() > 0) {
                 watchDog.setTimeout(msg.maxExecutionTime());
             }
@@ -120,7 +120,7 @@ public void execute(final Session wsSession, final EvalSession evalSession,
 
                 final Sequence result;
                 try {
-                    result = xquery.execute(broker, compiled, null, new Properties(), true);
+                    result = xquery.execute(broker, compiled, null, new Properties(), false);
                 } catch (final TerminatedException e) {
                     timing.evaluate = System.currentTimeMillis() - evalStart;
                     reportTerminationOrError(wsSession, evalSession, msg, timing, startTime,
@@ -164,6 +164,7 @@ public void execute(final Session wsSession, final EvalSession evalSession,
             } finally {
                 evalSession.unregisterQuery(msg.id());
                 context.runCleanupTasks();
+                context.reset();  // needed: resetContext=false skipped this in xquery.execute()
             }
 
         } catch (final EXistException | PermissionDeniedException e) {

exist-core/src/test/java/org/exist/http/ws/EvalWebSocketEndpointTest.java

@@ -658,10 +658,12 @@ public void onMessage(final String message) {
         }, createAdminConfig(), getWsUri());
 
         try {
-            // Query that should take longer than 2s timeout
+            // GC-free query: return () avoids heap exhaustion on CI, ensuring the 2s
+            // watchdog timeout fires reliably via proceed() rather than OOM killing
+            // the thread before the timeout check runs.
             session.getBasicRemote().sendText(
                     "{\"action\":\"eval\",\"id\":\"q-timeout\"," +
-                    "\"query\":\"let $x := for $i in 1 to 999999999 return string($i) return $x\"," +
+                    "\"query\":\"for $i in 1 to 999999999 return ()\"," +
                     "\"max-execution-time\":2000}");
 
             assertTrue("Should receive timeout error within 30s",