Update cabal.project and LanguageServer for improved logging and update to use new lsp revision

Author: soulomoon

.github/workflows/flakiness.yml

@@ -34,7 +34,7 @@ on:
 
 jobs:
   loop:
-    name: open-close loop (${{ matrix.os }})
+    name: Flakiness Test (broken pipe and test failures)
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -72,12 +72,12 @@ jobs:
           max_iter="${{ inputs.max_iter || '100' }}"
           bash scripts/open-close-loop.sh "${max_iter}"
           ec=$?
-          # Interpret: 1 = flake reproduced (fail the job), 1 = not reproduced within budget (pass), others = infra error
-          if [[ $ec -eq 1 ]]; then
-            echo "Broken pipe reproduced: marking job as failed"
+          # Interpret: 0 = issue reproduced (fail the job), 1 = not reproduced within budget (pass), others = infra error
+          if [[ $ec -eq 0 ]]; then
+            echo "Issue reproduced (broken pipe or test failure): marking job as failed"
             exit 1
-          elif [[ $ec -eq 0 ]]; then
-            echo "No flake reproduced within MAX_ITER=${max_iter}: passing"
+          elif [[ $ec -eq 1 ]]; then
+            echo "No issues reproduced within MAX_ITER=${max_iter}: passing"
             exit 0
           else
             echo "Loop script error (exit $ec): failing"

cabal.project

@@ -5,9 +5,6 @@ packages:
          ./ghcide
          ./hls-plugin-api
          ./hls-test-utils
-        -- /Volumes/src/lsp/lsp
-        -- /Volumes/src/lsp/lsp-types
-        -- /Volumes/src/lsp/lsp-test
 
 
 index-state: 2025-08-08T12:31:54Z
@@ -63,5 +60,5 @@ if impl(ghc >= 9.11)
 source-repository-package
   type: git
   location: https://github.com/soulomoon/lsp.git
-  tag: 4b57c8af1b5544c88bb040cf07132e611c5a0014
+  tag: 47b70011cae725233f0c5ebdf7141d5de0b3066e
   subdir: lsp lsp-types lsp-test

ghcide/src/Development/IDE/LSP/LanguageServer.hs

@@ -13,6 +13,7 @@ module Development.IDE.LSP.LanguageServer
     , runWithWorkerThreads
     , Setup (..)
     , InitializationContext (..)
+    , untilMVar'
     ) where
 
 import           Control.Concurrent.STM
@@ -64,10 +65,15 @@ data Log
   | LogLspServer LspServerLog
   | LogServerShutdownMessage
   | LogShutDownTimeout Int
+  | LogServerExitWith (Either () Int)
   deriving Show
 
 instance Pretty Log where
   pretty = \case
+    LogServerExitWith (Right code) ->
+      "Server exited with code" <+> pretty code
+    LogServerExitWith (Left _) ->
+      "Server forcefully exited due to exception in reactor thread"
     LogShutDownTimeout seconds ->
         "Shutdown timeout, the server will exit now after waiting for" <+> pretty seconds <+> "milliseconds"
     LogRegisteringIdeConfig ideConfig ->
@@ -169,7 +175,8 @@ runLanguageServer recorder options inH outH defaultConfig parseConfig onConfigCh
             outH
             serverDefinition
 
-    untilMVar clientMsgVar $ runServer `finally` sequence_ onExit
+    untilMVar' clientMsgVar runServer `finally` sequence_ onExit
+        >>= logWith recorder Info . LogServerExitWith
 
 setupLSP ::
      forall config.
@@ -340,6 +347,9 @@ runWithWorkerThreads recorder dbLoc f = evalContT $ do
 untilMVar :: MonadUnliftIO m => MVar () -> m a -> m ()
 untilMVar mvar io = race_ (readMVar mvar) io
 
+untilMVar' :: MonadUnliftIO m => MVar a -> m b -> m (Either a b)
+untilMVar' mvar io = race (readMVar mvar) io
+
 cancelHandler :: (SomeLspId -> IO ()) -> LSP.Handlers (ServerM c)
 cancelHandler cancelRequest = LSP.notificationHandler SMethod_CancelRequest $ \TNotificationMessage{_params=CancelParams{_id}} ->
   liftIO $ cancelRequest (SomeLspId (toLspId _id))

scripts/open-close-loop.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Loop running the "open close" test until a Broken pipe is observed.
+# Loop running the "open close" test until a Broken pipe or test failure is observed.
 # Writes each iteration's full output to test-logs/open-close-loop-<n>.log
 # Environment you can tweak:
 #   MAX_ITER   : maximum iterations before giving up (default: unlimited)
@@ -8,7 +8,7 @@
 #   LOG_STDERR : set to 1 to enable verbose stderr logging (HLS_TEST_LOG_STDERR & HLS_TEST_HARNESS_STDERR) (default: 1)
 #
 # Exit codes:
-#   0 on success (broken pipe reproduced)
+#   0 on success (broken pipe or test failure reproduced)
 #   1 on reaching MAX_ITER without reproduction
 #   2 on other setup error
 
@@ -30,8 +30,9 @@ iter=0
 start_ts=$(date -Iseconds)
 echo "[loop] Starting at ${start_ts}" >&2
 
-# Pattern string to detect (keep simple & literal for robustness)
+# Pattern strings to detect issues (keep simple & literal for robustness)
 BROKEN_PIPE_RE='Broken pipe'
+TEST_FAILED_RE='tests failed'
 DEBUG_DETECT="${DEBUG_DETECT:-0}"
 
 if [[ -z "${NO_BUILD_ONCE:-}" ]]; then
@@ -79,19 +80,24 @@ while true; do
     echo "[loop] Broken pipe reproduced in iteration ${iter}. Stopping." | tee -a "${log}" >&2
     echo "[loop] --- Tail (last 60 lines) ---" >&2
     tail -n 60 "${log}" >&2
-    exit 1
+    exit 0
+  elif grep -aFq -- "${TEST_FAILED_RE}" "${log}"; then
+    echo "[loop] Test failure detected in iteration ${iter}. Stopping." | tee -a "${log}" >&2
+    echo "[loop] --- Tail (last 60 lines) ---" >&2
+    tail -n 60 "${log}" >&2
+    exit 0
   else
     if [[ ${DEBUG_DETECT} -eq 1 ]]; then
-      echo "[loop][debug] No match for '${BROKEN_PIPE_RE}' in iteration ${iter}." | tee -a "${log}" >&2
+      echo "[loop][debug] No match for '${BROKEN_PIPE_RE}' or '${TEST_FAILED_RE}' in iteration ${iter}." | tee -a "${log}" >&2
     fi
   fi
 
   if [[ -n "${MAX_ITER}" && ${iter} -ge ${MAX_ITER} ]]; then
-    echo "[loop] Reached MAX_ITER=${MAX_ITER} without reproducing Broken pipe." >&2
-    exit 0
+    echo "[loop] Reached MAX_ITER=${MAX_ITER} without reproducing issues." >&2
+    exit 1
   fi
 
-  echo "[loop] Iteration ${iter} complete (exit code ${ec}). No Broken pipe yet." | tee -a "${log}" >&2
+  echo "[loop] Iteration ${iter} complete (exit code ${ec}). No issues detected yet." | tee -a "${log}" >&2
   if [[ ${SLEEP_SECS} -gt 0 ]]; then
     echo "[loop] Sleeping ${SLEEP_SECS}s" | tee -a "${log}" >&2
     sleep "${SLEEP_SECS}"