Merge pull request #6045 from unisonweb/cp/fix-paging

aryairani · web-flow · commit 004fe25ac452 · 2025-12-10T17:48:45.000-07:00
diff --git a/unison-cli/src/Unison/Codebase/Editor/Output.hs b/unison-cli/src/Unison/Codebase/Editor/Output.hs
@@ -15,6 +15,7 @@ module Unison.Codebase.Editor.Output
     ShareError (..),
     isFailure,
     isNumberedFailure,
+    outputShouldUsePager,
   )
 where
 
@@ -534,6 +535,15 @@ data UndoFailureReason = CantUndoPastStart | CantUndoPastMerge deriving (Show)
 
 type SourceFileContents = Text
 
+outputShouldUsePager :: Output -> Bool
+outputShouldUsePager o = case o of
+  -- These are typically non-interactive outputs, so we don't page them.
+  LoadingFile {} -> False
+  Typechecked {} -> False
+  Evaluated {} -> False
+  EvaluationFailure {} -> False
+  _ -> True
+
 isFailure :: Output -> Bool
 isFailure o = case o of
   DeleteFailure {} -> True
diff --git a/unison-cli/src/Unison/CommandLine/Main.hs b/unison-cli/src/Unison/CommandLine/Main.hs
@@ -33,7 +33,7 @@ import Unison.Codebase qualified as Codebase
 import Unison.Codebase.Branch (Branch)
 import Unison.Codebase.Editor.HandleInput qualified as HandleInput
 import Unison.Codebase.Editor.Input (Event (UnisonFileChanged), Input (..))
-import Unison.Codebase.Editor.Output (NumberedArgs, Output)
+import Unison.Codebase.Editor.Output (NumberedArgs, Output, outputShouldUsePager)
 import Unison.Codebase.Editor.UCMVersion (UCMVersion)
 import Unison.Codebase.ProjectPath qualified as PP
 import Unison.Codebase.Watch qualified as Watch
@@ -225,8 +225,6 @@ main dir welcome ppIds initialInputs runtime sbRuntime codebase serverBaseUrl uc
 
       let initialState = Cli.loopState0 ppIds
       initialInputsRef <- newIORef $ Welcome.run welcome ++ initialInputs ++ invalidProjectNamesInputs
-      pageOutput <- newIORef True
-
       initialEcho <- hGetEcho stdin
       let restoreEcho = (\currentEcho -> when (currentEcho /= initialEcho) $ hSetEcho stdin initialEcho)
       let getInput :: Cli.LoopState -> IO Input
@@ -243,14 +241,11 @@ main dir welcome ppIds initialInputs runtime sbRuntime codebase serverBaseUrl uc
               getProjectRoot
               (loopState ^. #numberedArgs)
       let notify :: Output -> IO ()
-          notify =
-            notifyUser (pure dir) fetchIssueFromGitHub
-              >=> ( \o ->
-                      ifM
-                        (readIORef pageOutput)
-                        (putPrettyNonempty o)
-                        (putPrettyLnUnpaged o)
-                  )
+          notify o = do
+            rendered <- notifyUser (pure dir) fetchIssueFromGitHub o
+            if outputShouldUsePager o
+              then putPrettyNonempty rendered
+              else putPrettyLnUnpaged rendered
 
       let awaitInput :: Cli.LoopState -> IO (Either Event Input)
           awaitInput loopState = do
@@ -267,11 +262,11 @@ main dir welcome ppIds initialInputs runtime sbRuntime codebase serverBaseUrl uc
                       [ do
                           event <- Ki.await fileEventThread
                           pure do
-                            writeIORef pageOutput False
                             pure (Left event),
                         do
                           input <- Ki.await userInputThread
-                          pure (pure (Right input))
+                          pure do
+                            pure (Right input)
                       ]
                 action
 
