1 files changed, 38 insertions, 25 deletions

diff --git a/Omni/Agent/Log.hs b/Omni/Agent/Log.hs
index afaf1da..2e26272 100644
--- a/Omni/Agent/Log.hs
+++ b/Omni/Agent/Log.hs
@@ -16,6 +16,7 @@ import System.IO.Unsafe (unsafePerformIO)
 data Status = Status
   { statusWorker :: Text,
     statusTask :: Maybe Text,
+    statusThreadId :: Maybe Text,
     statusFiles :: Int,
     statusCredits :: Double,
     statusTime :: Text, -- formatted time string
@@ -28,6 +29,7 @@ emptyStatus workerName =
   Status
     { statusWorker = workerName,
       statusTask = Nothing,
+      statusThreadId = Nothing,
       statusFiles = 0,
       statusCredits = 0.0,
       statusTime = "00:00",
@@ -44,10 +46,9 @@ init :: Text -> IO ()
 init workerName = do
   IO.hSetBuffering IO.stderr IO.LineBuffering
   writeIORef currentStatus (emptyStatus workerName)
-  -- Reserve 2 lines at bottom
-  IO.hPutStrLn IO.stderr ""
-  IO.hPutStrLn IO.stderr ""
-  ANSI.hCursorUp IO.stderr 2
+  -- Reserve 5 lines at bottom
+  replicateM_ 5 (IO.hPutStrLn IO.stderr "")
+  ANSI.hCursorUp IO.stderr 5
 
 -- | Update the status
 update :: (Status -> Status) -> IO ()
@@ -62,11 +63,17 @@ updateActivity msg = update (\s -> s {statusActivity = msg})
 -- | Log a scrolling message (appears above status bars)
 log :: Text -> IO ()
 log msg = do
-  -- Clear status bars
+  -- Clear status bars (5 lines)
   ANSI.hClearLine IO.stderr
   ANSI.hCursorDown IO.stderr 1
   ANSI.hClearLine IO.stderr
-  ANSI.hCursorUp IO.stderr 1
+  ANSI.hCursorDown IO.stderr 1
+  ANSI.hClearLine IO.stderr
+  ANSI.hCursorDown IO.stderr 1
+  ANSI.hClearLine IO.stderr
+  ANSI.hCursorDown IO.stderr 1
+  ANSI.hClearLine IO.stderr
+  ANSI.hCursorUp IO.stderr 4
 
   -- Print message (scrolls screen)
   TIO.hPutStrLn IO.stderr msg
@@ -75,37 +82,43 @@ log msg = do
   -- (Since we scrolled, we are now on the line above where the first status line should be)
   render
 
--- | Render the two status lines
+-- | Render the 5 status lines (Vertical Layout)
 render :: IO ()
 render = do
   Status {..} <- readIORef currentStatus
 
-  -- Line 1: Meta
-  -- [Worker: name] Task: t-123 | Files: 3 | Credits: $0.45 | Time: 05:23
   let taskStr = maybe "None" identity statusTask
-      meta =
-        "[Worker: "
-          <> statusWorker
-          <> "] Task: "
-          <> taskStr
-          <> " | Files: "
-          <> tshow statusFiles
-          <> " | Credits: $"
-          <> tshow statusCredits
-          <> " | Time: "
-          <> statusTime
+      threadStr = maybe "None" identity statusThreadId
+
+  -- Line 1: Worker + Time
+  ANSI.hSetCursorColumn IO.stderr 0
+  ANSI.hClearLine IO.stderr
+  TIO.hPutStr IO.stderr <| "Worker: " <> statusWorker <> " | Time: " <> statusTime
 
+  -- Line 2: Task
+  ANSI.hCursorDown IO.stderr 1
+  ANSI.hSetCursorColumn IO.stderr 0
+  ANSI.hClearLine IO.stderr
+  TIO.hPutStr IO.stderr <| "Task: " <> taskStr
+
+  -- Line 3: Thread
+  ANSI.hCursorDown IO.stderr 1
+  ANSI.hSetCursorColumn IO.stderr 0
+  ANSI.hClearLine IO.stderr
+  TIO.hPutStr IO.stderr <| "Thread: " <> threadStr
+
+  -- Line 4: Credits
+  ANSI.hCursorDown IO.stderr 1
   ANSI.hSetCursorColumn IO.stderr 0
   ANSI.hClearLine IO.stderr
-  TIO.hPutStr IO.stderr meta
+  TIO.hPutStr IO.stderr <| "Credits: $" <> tshow statusCredits
 
-  -- Line 2: Activity
-  -- [14:05:22] > Thinking...
+  -- Line 5: Activity
   ANSI.hCursorDown IO.stderr 1
   ANSI.hSetCursorColumn IO.stderr 0
   ANSI.hClearLine IO.stderr
   TIO.hPutStr IO.stderr ("> " <> statusActivity)
 
-  -- Return cursor to line 1
-  ANSI.hCursorUp IO.stderr 1
+  -- Return cursor to Line 1
+  ANSI.hCursorUp IO.stderr 4
   IO.hFlush IO.stderr