Merge branch 'live' into task/t-rWcmRMaWX.3

7 files changed, 359 insertions, 60 deletions

diff --git a/.tasks/tasks.jsonl b/.tasks/tasks.jsonl
index 9a194a0..86534a0 100644
--- a/.tasks/tasks.jsonl
+++ b/.tasks/tasks.jsonl
@@ -164,10 +164,30 @@
 {"taskCreatedAt":"2025-11-21T22:31:20.872934097Z","taskDependencies":[],"taskDescription":null,"taskId":"t-rWblzNdp4.3","taskNamespace":null,"taskParent":"t-rWblzNdp4","taskPriority":"P2","taskStatus":"Done","taskTitle":"Implement smart base branch selection in Worker","taskType":"WorkTask","taskUpdatedAt":"2025-11-21T22:36:36.614180518Z"}
 {"taskCreatedAt":"2025-11-21T23:01:48.224051611Z","taskDependencies":[],"taskDescription":null,"taskId":"t-rWbnAjCJH","taskNamespace":null,"taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Update start-worker.sh to use Haskell agent","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T01:34:02.545292575Z"}
 {"taskCreatedAt":"2025-11-22T01:34:07.407341455Z","taskDependencies":[],"taskDescription":"Omni/Bild.hs:776 has a TODO: wrapper should just be removed, instead rely on upstream nixpkgs builders to make wrappers. This simplifies the codebase by removing manual bash script generation.","taskId":"t-rWbMpcV4v","taskNamespace":"Omni/Bild.hs","taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Remove manual wrapper generation in Omni/Bild","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T03:21:49.357422745Z"}
-{"taskCreatedAt":"2025-11-22T01:34:12.233596517Z","taskDependencies":[],"taskDescription":"Implement a metrics view in the Admin dashboard (Biz/PodcastItLater/Admin.py). Show total users, active subscriptions, and recent submission counts. Ref: Biz/PodcastItLater/DESIGN.md","taskId":"t-rWbMpxaBk","taskNamespace":"Biz/PodcastItLater.hs","taskParent":null,"taskPriority":"P2","taskStatus":"InProgress","taskTitle":"Implement metrics view in Admin dashboard","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T03:10:06.641517277Z"}
+{"taskCreatedAt":"2025-11-22T01:34:12.233596517Z","taskDependencies":[],"taskDescription":"Implement a metrics view in the Admin dashboard (Biz/PodcastItLater/Admin.py). Show total users, active subscriptions, and recent submission counts. Ref: Biz/PodcastItLater/DESIGN.md","taskId":"t-rWbMpxaBk","taskNamespace":"Biz/PodcastItLater.hs","taskParent":null,"taskPriority":"P2","taskStatus":"Review","taskTitle":"Implement metrics view in Admin dashboard","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T10:39:55.344152609Z"}
 {"taskCreatedAt":"2025-11-22T01:34:19.451799517Z","taskDependencies":[],"taskDescription":"Update Omni/Agent/start-worker.sh to invoke the new Haskell-based agent binary ('agent start <name>') instead of running the legacy bash loop. Ensure it still sets up the environment correctly. The agent binary handles the loop internally.","taskId":"t-rWbMq1snX","taskNamespace":"Omni/Agent.hs","taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Update start-worker.sh to use Haskell agent","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T01:57:09.161716208Z"}
 {"taskCreatedAt":"2025-11-22T02:13:44.805917094Z","taskDependencies":[],"taskDescription":"Modify Omni/Agent/Git.hs to proactively clean up stale rebase/merge states before attempting operations. The worker should attempt 'git rebase --abort' (ignoring errors) before syncing to prevent 'already rebase-merge' errors.","taskId":"t-rWbP06f2O","taskNamespace":null,"taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Make worker agent robust to stale git states","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T02:14:40.413090556Z"}
 {"taskCreatedAt":"2025-11-22T02:26:44.02456019Z","taskDependencies":[],"taskDescription":"Modify Omni/Agent/Git.hs to check for .git/rebase-merge or .git/rebase-apply before running git rebase --abort. This avoids blindly running abort commands.","taskId":"t-rWbPQPLps","taskNamespace":null,"taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Detect in-progress rebase before aborting in Agent","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T02:27:45.377866012Z"}
 {"taskCreatedAt":"2025-11-22T03:01:36.84628158Z","taskDependencies":[],"taskDescription":"Modify Omni/Agent/Worker.hs to check if the task branch already exists before trying to create it. If it exists, simply checkout the branch. This prevents 'fatal: a branch named ... already exists' errors when restarting the worker.","taskId":"t-rWbS8t1Wv","taskNamespace":"Omni/Agent.hs","taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Handle existing task branch in Worker Agent","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T03:02:31.746506652Z"}
 {"taskCreatedAt":"2025-11-22T03:09:54.022974779Z","taskDependencies":[],"taskDescription":"Implement the 2-line status UI described in Omni/Agent/DESIGN.md (Section 4.3). It should reserve 2 lines at the bottom for Meta (Task ID, Time) and Activity (current thought/action), allowing history to scroll above. Use ANSI codes for cursor management.","taskId":"t-rWbSG78jq","taskNamespace":"Omni/Agent/Log.hs","taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Implement 2-line Agent Status UI","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T03:21:54.480763142Z"}
 {"taskCreatedAt":"2025-11-22T11:31:50.378377038Z","taskDependencies":[],"taskDescription":null,"taskId":"t-rWcpygi7d","taskNamespace":null,"taskParent":null,"taskPriority":"P2","taskStatus":"Open","taskTitle":"Test Lowercase","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T11:31:50.378377038Z"}
+{"taskCreatedAt":"2025-11-22T11:34:17.854509264Z","taskDependencies":[],"taskDescription":null,"taskId":"t-rWcpIf5ov","taskNamespace":null,"taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"--help","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T11:39:43.304029721Z"}
+{"taskCreatedAt":"2025-11-22T04:02:16.914288868Z","taskDependencies":[{"depId":"t-rWbMpcV4v","depType":"Blocks"},{"depId":"t-rWbMpxaBk","depType":"Blocks"},{"depId":"t-rWbS8t1Wv","depType":"Blocks"}],"taskDescription":"Update Omni/Agent/Worker.hs to spawn a background thread that tails '_/llm/amp.log' while the Amp agent is running. For each new line in the log: 1. Parse it (it's JSON). 2. Extract a user-friendly summary (e.g. 'Thinking...', 'Tool: Bash'). 3. Update the status bar activity line (AgentLog.updateActivity) with this summary. This provides real-time visibility into what the agent is doing.","taskId":"t-rWbW6OnUO","taskNamespace":"Omni/Agent/Worker.hs","taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Stream Amp logs to Agent status bar","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T10:05:14.217613978Z"}
+{"taskCreatedAt":"2025-11-22T09:41:06.786529414Z","taskDependencies":[],"taskDescription":"Replace 'git rebase live' with 'git sync' (which maps to git-branchless sync) in Omni.Agent.Git.syncWithLive. This aligns with the branchless workflow and handles stack rebasing automatically.","taskId":"t-rWciiEsnZ","taskNamespace":"Omni/Agent/Git.hs","taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Use 'git sync' instead of 'git rebase' in Agent","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T09:42:37.875643446Z"}
+{"taskCreatedAt":"2025-11-22T09:50:59.154884329Z","taskDependencies":[],"taskDescription":"1. Add Thread ID to the status bar (requires log parsing later, but add field now). 2. Make the status layout responsive or vertical (4 lines) to fit on small screens (iPhone). 3. Reserve more lines in init.","taskId":"t-rWciWJYsi","taskNamespace":"Omni/Agent/Log.hs","taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Improve Agent Status UI for mobile & debugging","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T09:52:36.176467065Z"}
+{"taskCreatedAt":"2025-11-22T10:09:23.249166289Z","taskDependencies":[],"taskDescription":null,"taskId":"t-rWck9sDOA","taskNamespace":"Omni/Agent.hs","taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Split Thread and Credits in Worker status bar","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T10:10:17.800528662Z"}
+{"taskCreatedAt":"2025-11-22T10:12:35.129294132Z","taskDependencies":[{"depId":"t-rWck9sDOA","depType":"DiscoveredFrom"}],"taskDescription":null,"taskId":"t-rWckmrKBm","taskNamespace":null,"taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Fix Worker status bar activity not updating","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T10:14:43.612634394Z"}
+{"taskCreatedAt":"2025-11-22T10:24:04.441689132Z","taskDependencies":[{"depId":"t-rWckmrKBm","depType":"DiscoveredFrom"}],"taskDescription":null,"taskId":"t-rWcl762fd","taskNamespace":null,"taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Fix credit calculation in Worker status bar","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T10:25:51.468062833Z"}
+{"taskCreatedAt":"2025-11-22T10:32:31.370216711Z","taskDependencies":[],"taskDescription":"Map raw Amp log messages to human-friendly status updates (e.g. 'READ: ...', 'TOOL: ...'), similar to monitor-worker.sh, but WITHOUT using emojis as they are unnecessary.","taskId":"t-rWclFp3vN","taskNamespace":"Omni/Agent.hs","taskParent":null,"taskPriority":"P2","taskStatus":"Review","taskTitle":"Improve Worker status bar activity formatting (No Emojis)","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T10:52:00.768159587Z"}
+{"taskCreatedAt":"2025-11-22T10:35:13.559736706Z","taskDependencies":[{"depId":"t-rWcl762fd","depType":"DiscoveredFrom"}],"taskDescription":null,"taskId":"t-rWclQnApM","taskNamespace":null,"taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Verify credit units in amp logs","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T10:41:51.876980566Z"}
+{"taskCreatedAt":"2025-11-22T10:41:55.215833393Z","taskDependencies":[],"taskDescription":"The credits in usage-ledger logs are in cents, but we display them as dollars. We need to divide by 100.","taskId":"t-rWcmhyTvV","taskNamespace":"Omni/Agent.hs","taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Divide usage-ledger credits by 100 to get dollars","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T10:42:42.156523503Z"}
+{"taskCreatedAt":"2025-11-22T10:50:50.329217484Z","taskDependencies":[],"taskDescription":"Collection of tasks to improve the robustness of the codebase (builds), the usability of the 'task' tool, and the accuracy of the agent's status reporting.","taskId":"t-rWcmRMaWX","taskNamespace":"Omni.hs","taskParent":null,"taskPriority":"P2","taskStatus":"Open","taskTitle":"Codebase Health and Tooling Improvements","taskType":"Epic","taskUpdatedAt":"2025-11-22T10:50:50.329217484Z"}
+{"taskCreatedAt":"2025-11-22T10:50:57.552875891Z","taskDependencies":[],"taskDescription":"Implement a 'task edit <id>' command (or 'task update' extension) that allows modifying a task's title, description, priority, and other fields in-place. Currently 'task update' only changes status.","taskId":"t-rWcmRMaWX.1","taskNamespace":"Omni/Task.hs","taskParent":"t-rWcmRMaWX","taskPriority":"P2","taskStatus":"Done","taskTitle":"Add 'task edit' command","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T11:16:49.365516683Z"}
+{"taskCreatedAt":"2025-11-22T10:51:01.309897479Z","taskDependencies":[],"taskDescription":"Update the Worker Agent status bar logic to round the displayed credit usage to 2 decimal places (nearest cent). Currently it may show long floating point numbers.","taskId":"t-rWcmRMaWX.2","taskNamespace":"Omni/Agent.hs","taskParent":"t-rWcmRMaWX","taskPriority":"P2","taskStatus":"Review","taskTitle":"Round credits to nearest cent in Agent status","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T11:26:08.486852994Z"}
+{"taskCreatedAt":"2025-11-22T10:51:04.73629995Z","taskDependencies":[],"taskDescription":"Update Omni/Task/Core.hs to handle task IDs case-insensitively for lookups and normalize them to lowercase when storing/creating. This improves user experience when typing IDs manually.","taskId":"t-rWcmRMaWX.3","taskNamespace":"Omni/Task.hs","taskParent":"t-rWcmRMaWX","taskPriority":"P2","taskStatus":"Review","taskTitle":"Case-insensitive task IDs","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T11:32:56.498756179Z"}
+{"taskCreatedAt":"2025-11-22T10:51:08.813653444Z","taskDependencies":[],"taskDescription":"Create an agent or script that iterates through every namespace in the project and runs 'bild' (e.g. 'bild --time 0 **/*'). For every build failure encountered, it should automatically create a new task with the error details and link it to this epic (or the discovery context).","taskId":"t-rWcmRMaWX.4","taskNamespace":"Omni/Bild.hs","taskParent":"t-rWcmRMaWX","taskPriority":"P2","taskStatus":"Done","taskTitle":"Audit codebase builds and file repair tasks","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T11:51:55.014259557Z"}
+{"taskCreatedAt":"2025-11-22T11:27:59.621730567Z","taskDependencies":[],"taskDescription":"Update Omni/Agent/Worker.hs to read the content of AGENTS.md and include a relevant summary or the full content in the initial system prompt provided to the Amp agent. This ensures the worker knows about repository conventions, testing standards, and tool usage.","taskId":"t-rWcpiE3LO","taskNamespace":"Omni/Agent.hs","taskParent":null,"taskPriority":"P2","taskStatus":"Done","taskTitle":"Include AGENTS.md context in Worker initial prompt","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T11:36:14.542146518Z"}
+{"taskCreatedAt":"2025-11-22T11:45:43.502171517Z","taskDependencies":[],"taskDescription":"Remove unused test files, migrate useful tests to the main suite, and remove legacy bash prototype scripts replaced by the Haskell implementation.","taskId":"t-rWcqsDZFM","taskNamespace":"Omni/Agent.hs","taskParent":null,"taskPriority":"P2","taskStatus":"Open","taskTitle":"Cleanup Omni/Agent files and tests","taskType":"Epic","taskUpdatedAt":"2025-11-22T11:45:43.502171517Z"}
+{"taskCreatedAt":"2025-11-22T11:45:49.548163416Z","taskDependencies":[],"taskDescription":"Omni/Agent/LogTest.hs is currently unused by the main 'bild --test Omni/Agent.hs' command. Review its contents, move any valuable tests to Omni/Agent.hs (or Omni/Agent/Log.hs's test section), and delete the file.","taskId":"t-rWcqsDZFM.1","taskNamespace":"Omni/Agent.hs","taskParent":"t-rWcqsDZFM","taskPriority":"P2","taskStatus":"Open","taskTitle":"Consolidate LogTest.hs into main test suite","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T11:45:49.548163416Z"}
+{"taskCreatedAt":"2025-11-22T11:45:57.926946967Z","taskDependencies":[],"taskDescription":"Remove bash scripts that have been superseded by the Haskell agent implementation. Candidates for removal: harvest-tasks.sh, merge-tasks.sh, sync-tasks.sh, setup-worker.sh. Ensure functionality is covered by Haskell code before deletion.","taskId":"t-rWcqsDZFM.2","taskNamespace":"Omni/Agent.hs","taskParent":"t-rWcqsDZFM","taskPriority":"P2","taskStatus":"Open","taskTitle":"Remove legacy bash prototype scripts","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T11:45:57.926946967Z"}
+{"taskCreatedAt":"2025-11-22T11:46:03.875940421Z","taskDependencies":[],"taskDescription":"We have both 'monitor.sh' and 'monitor-worker.sh'. Consolidate them into a single 'monitor.sh' script and remove the duplicate.","taskId":"t-rWcqsDZFM.3","taskNamespace":"Omni/Agent.hs","taskParent":"t-rWcqsDZFM","taskPriority":"P2","taskStatus":"Open","taskTitle":"Consolidate monitor scripts","taskType":"WorkTask","taskUpdatedAt":"2025-11-22T11:46:03.875940421Z"}
diff --git a/Omni/Agent/Git.hs b/Omni/Agent/Git.hs
index a2009b2..b1978f2 100644
--- a/Omni/Agent/Git.hs
+++ b/Omni/Agent/Git.hs
@@ -25,7 +25,6 @@ import Omni.Test ((@=?))
 import qualified Omni.Test as Test
 import qualified System.Directory as Directory
 import qualified System.Exit as Exit
-import System.FilePath ((</>))
 import qualified System.IO.Temp as Temp
 import qualified System.Process as Process
 
@@ -149,30 +148,16 @@ syncWithLive repo = do
   Log.info ["git", "syncing with live"]
   -- git repo ["fetch", "origin", "live"] -- Optional
 
-  -- Try rebase, if fail, abort
-  -- First, proactively cleanup any stale rebase state
-  cleanupStaleRebase repo
-
-  let cmd = (Process.proc "git" ["rebase", "live"]) {Process.cwd = Just repo}
-  (code, _, err) <- Process.readCreateProcessWithExitCode cmd ""
+  -- Try sync (branchless sync), if fail, panic
+  -- This replaces manual rebase and handles stack movement
+  let cmd = (Process.proc "git" ["sync"]) {Process.cwd = Just repo}
+  (code, out, err) <- Process.readCreateProcessWithExitCode cmd ""
   case code of
     Exit.ExitSuccess -> pure ()
     Exit.ExitFailure _ -> do
-      Log.warn ["rebase failed, aborting", Text.pack err]
-      cleanupStaleRebase repo
-      panic "Sync with live failed (rebase conflict)"
-
-cleanupStaleRebase :: FilePath -> IO ()
-cleanupStaleRebase repo = do
-  -- Check if a rebase is in progress
-  rebaseMerge <- Directory.doesDirectoryExist (repo </> ".git/rebase-merge")
-  rebaseApply <- Directory.doesDirectoryExist (repo </> ".git/rebase-apply")
-
-  when (rebaseMerge || rebaseApply) <| do
-    Log.warn ["git", "detected stale rebase", "aborting"]
-    let abort = (Process.proc "git" ["rebase", "--abort"]) {Process.cwd = Just repo}
-    _ <- Process.readCreateProcessWithExitCode abort ""
-    pure ()
+      Log.warn ["git sync failed", Text.pack err]
+      Log.info [Text.pack out]
+      panic "Sync with live failed (git sync)"
 
 commit :: FilePath -> Text -> IO ()
 commit repo msg = do
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
diff --git a/Omni/Agent/Worker.hs b/Omni/Agent/Worker.hs
index 01099a0..a861173 100644
--- a/Omni/Agent/Worker.hs
+++ b/Omni/Agent/Worker.hs
@@ -5,7 +5,12 @@
 module Omni.Agent.Worker where
 
 import Alpha
+import qualified Data.Aeson as Aeson
+import qualified Data.Aeson.KeyMap as KM
+import qualified Data.ByteString.Lazy as BL
+import qualified Data.Scientific as Scientific
 import qualified Data.Text as Text
+import qualified Data.Time as Time
 import qualified Omni.Agent.Core as Core
 import qualified Omni.Agent.Git as Git
 import qualified Omni.Agent.Log as AgentLog
@@ -13,6 +18,7 @@ import qualified Omni.Task.Core as TaskCore
 import qualified System.Directory as Directory
 import qualified System.Exit as Exit
 import System.FilePath ((</>))
+import qualified System.IO as IO
 import qualified System.Process as Process
 
 start :: Core.Worker -> IO ()
@@ -58,7 +64,7 @@ processTask worker task = do
   AgentLog.updateActivity ("Claiming task " <> tid)
 
   -- Claim task
-  TaskCore.updateTaskStatus tid TaskCore.InProgress
+  TaskCore.updateTaskStatus tid TaskCore.InProgress []
 
   -- Commit claim locally
   Git.commit repo ("task: claim " <> tid)
@@ -94,7 +100,7 @@ processTask worker task = do
       AgentLog.log "Agent finished successfully"
 
       -- Update status to Review (bundled with feature commit)
-      TaskCore.updateTaskStatus tid TaskCore.Review
+      TaskCore.updateTaskStatus tid TaskCore.Review []
 
       -- Commit changes
       -- We should check if there are changes, but 'git add .' is safe.
@@ -111,12 +117,11 @@ processTask worker task = do
       Git.syncWithLive repo
 
       -- Update status to Review (for signaling)
-      TaskCore.updateTaskStatus tid TaskCore.Review
+      TaskCore.updateTaskStatus tid TaskCore.Review []
       Git.commit repo ("task: review " <> tid)
-      
+
       AgentLog.log ("[✓] Task " <> tid <> " completed")
       AgentLog.update (\s -> s {AgentLog.statusTask = Nothing})
-      
     Exit.ExitFailure code -> do
       AgentLog.log ("Agent failed with code " <> tshow code)
       AgentLog.updateActivity "Agent failed, retrying..."
@@ -144,13 +149,41 @@ runAmp repo task = do
           <> "'.\n"
 
   Directory.createDirectoryIfMissing True (repo </> "_/llm")
+  let logFile = repo </> "_/llm/amp.log"
+
+  -- Read AGENTS.md
+  agentsMd <-
+    fmap (fromMaybe "") <| do
+      exists <- Directory.doesFileExist (repo </> "AGENTS.md")
+      if exists
+        then Just </ readFile (repo </> "AGENTS.md")
+        else pure Nothing
+
+  let fullPrompt =
+        prompt
+          <> "\n\nREPOSITORY GUIDELINES (AGENTS.md):\n"
+          <> agentsMd
+
+  -- Clean up previous log
+  exists <- Directory.doesFileExist logFile
+  when exists (Directory.removeFile logFile)
+
+  -- Start background monitors
+  tidTime <- forkIO timeTicker
+  tidLog <- forkIO (monitorLog logFile)
 
   -- Assume amp is in PATH
-  let args = ["--log-level", "debug", "--log-file", "_/llm/amp.log", "--dangerously-allow-all", "-x", Text.unpack prompt]
+  let args = ["--log-level", "debug", "--log-file", "_/llm/amp.log", "--dangerously-allow-all", "-x", Text.unpack fullPrompt]
 
   let cp = (Process.proc "amp" args) {Process.cwd = Just repo}
   (_, _, _, ph) <- Process.createProcess cp
-  Process.waitForProcess ph
+  exitCode <- Process.waitForProcess ph
+
+  -- Cleanup
+  killThread tidTime
+  killThread tidLog
+
+  pure exitCode
 
 formatTask :: TaskCore.Task -> Text
 formatTask t =
@@ -202,3 +235,58 @@ findBaseBranch repo task = do
   case candidates of
     (candidate : _) -> pure ("task/" <> TaskCore.depId candidate)
     [] -> pure "live"
+
+monitorLog :: FilePath -> IO ()
+monitorLog logPath = do
+  waitForFile logPath
+  IO.withFile logPath IO.ReadMode <| \h -> do
+    -- Start from beginning of file (don't seek to end)
+    forever <| do
+      eof <- IO.hIsEOF h
+      if eof
+        then threadDelay 100000 -- 0.1s
+        else do
+          line <- IO.hGetLine h
+          parseAndUpdate (Text.pack line)
+
+waitForFile :: FilePath -> IO ()
+waitForFile path = do
+  exists <- Directory.doesFileExist path
+  if exists
+    then pure ()
+    else do
+      threadDelay 100000
+      waitForFile path
+
+parseAndUpdate :: Text -> IO ()
+parseAndUpdate line = do
+  let maybeObj = Aeson.decode (BL.fromStrict (encodeUtf8 line)) :: Maybe Aeson.Object
+  case maybeObj of
+    Nothing -> pure ()
+    Just obj -> do
+      -- Extract message (was msg)
+      case KM.lookup "message" obj of
+        Just (Aeson.String m) -> unless (Text.null m) (AgentLog.updateActivity m)
+        _ -> pure ()
+
+      -- Extract threadId
+      case KM.lookup "threadId" obj of
+        Just (Aeson.String tid) -> AgentLog.update (\s -> s {AgentLog.statusThreadId = Just tid})
+        _ -> pure ()
+
+      -- Extract cost from usage-ledger:event
+      -- Pattern: {"totalCredits": 154.0, "message": "usage-ledger:event", ...}
+      -- The credits are in cents, so we divide by 100 to get dollars.
+      case KM.lookup "totalCredits" obj of
+        Just (Aeson.Number n) ->
+          let total = Scientific.toRealFloat n / 100.0
+           in AgentLog.update (\s -> s {AgentLog.statusCredits = total})
+        _ -> pure ()
+
+timeTicker :: IO ()
+timeTicker =
+  forever <| do
+    time <- Time.getCurrentTime
+    let timeStr = Time.formatTime Time.defaultTimeLocale "%H:%M" time
+    AgentLog.update (\s -> s {AgentLog.statusTime = Text.pack timeStr})
+    threadDelay 1000000 -- 1s
diff --git a/Omni/Bild/Audit.py b/Omni/Bild/Audit.py
new file mode 100755
index 0000000..4df6c0b
--- /dev/null
+++ b/Omni/Bild/Audit.py
@@ -0,0 +1,176 @@
+#!/usr/bin/env python3
+"""
+Audit codebase builds.
+
+Iterates through every namespace in the project and runs 'bild'.
+For every build failure encountered, it automatically creates a new task.
+"""
+
+# : out bild-audit
+
+import argparse
+import re
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+
+# Extensions supported by bild (from Omni/Bild.hs and Omni/Namespace.hs)
+EXTENSIONS = {".c", ".hs", ".lisp", ".nix", ".py", ".scm", ".rs", ".toml"}
+MAX_TITLE_LENGTH = 50
+
+
+def strip_ansi(text: str) -> str:
+    """Strip ANSI escape codes from text."""
+    ansi_escape = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")
+    return ansi_escape.sub("", text)
+
+
+def is_ignored(path: Path) -> bool:
+    """Check if a file is ignored by git."""
+    res = subprocess.run(
+        ["git", "check-ignore", str(path)],
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL,
+        check=False,
+    )
+    return res.returncode == 0
+
+
+def get_buildable_files(root_dir: str = ".") -> list[str]:
+    """Find all files that bild can build."""
+    targets: list[str] = []
+
+    root = Path(root_dir)
+    if not root.exists():
+        return []
+
+    for path in root.rglob("*"):
+        # Skip directories
+        if path.is_dir():
+            continue
+
+        # Skip hidden files/dirs and '_' dirs
+        parts = path.parts
+        if any(p.startswith(".") or p == "_" for p in parts):
+            continue
+
+        if path.suffix in EXTENSIONS:
+            # Clean up path: keep it relative to cwd if possible
+            try:
+                # We want the path as a string, relative to current directory
+                # if possible
+                p_str = (
+                    str(path.relative_to(Path.cwd()))
+                    if path.is_absolute()
+                    else str(path)
+                )
+            except ValueError:
+                p_str = str(path)
+
+            if not is_ignored(Path(p_str)):
+                targets.append(p_str)
+    return targets
+
+
+def run_bild(target: str) -> subprocess.CompletedProcess[str]:
+    """Run bild on the target."""
+    # --time 0 disables timeout
+    # --loud enables output (which we capture)
+    cmd = ["bild", "--time", "0", "--loud", target]
+    return subprocess.run(cmd, capture_output=True, text=True, check=False)
+
+
+def create_task(
+    target: str,
+    result: subprocess.CompletedProcess[str],
+    parent_id: str | None = None,
+) -> None:
+    """Create a task for a build failure."""
+    # Construct a descriptive title
+    # Try to get the last meaningful line of error output
+    lines = (result.stdout + result.stderr).strip().split("\n")
+    last_line = lines[-1] if lines else "Unknown error"
+    last_line = strip_ansi(last_line).strip()
+
+    if len(last_line) > MAX_TITLE_LENGTH:
+        last_line = last_line[: MAX_TITLE_LENGTH - 3] + "..."
+
+    title = f"Build failed: {target} - {last_line}"
+
+    cmd = ["task", "create", title, "--priority", "2", "--json"]
+
+    if parent_id:
+        cmd.append(f"--discovered-from={parent_id}")
+
+    # Try to infer namespace
+    # e.g. Omni/Bild.hs -> Omni/Bild
+    ns = Path(target).parent
+    if str(ns) != ".":
+        cmd.append(f"--namespace={ns}")
+
+    print(f"Creating task for {target}...")  # noqa: T201
+    proc = subprocess.run(cmd, capture_output=True, text=True, check=False)
+
+    if proc.returncode != 0:
+        print(f"Error creating task: {proc.stderr}", file=sys.stderr)  # noqa: T201
+    else:
+        # task create --json returns the created task json
+        print(f"Task created: {proc.stdout.strip()}")  # noqa: T201
+
+
+def main() -> None:
+    """Run the build audit."""
+    parser = argparse.ArgumentParser(description="Audit codebase builds.")
+    parser.add_argument(
+        "--parent",
+        help="Parent task ID to link discovered tasks to",
+    )
+    parser.add_argument(
+        "paths",
+        nargs="*",
+        default=["."],
+        help="Paths to search for targets",
+    )
+    args = parser.parse_args()
+
+    # Check if bild is available
+    if not shutil.which("bild"):
+        print(  # noqa: T201
+            "Warning: 'bild' command not found. Ensure it is in PATH.",
+            file=sys.stderr,
+        )
+
+    print(f"Scanning for targets in {args.paths}...")  # noqa: T201
+    targets: list[str] = []
+    for path_str in args.paths:
+        path = Path(path_str)
+        if path.is_file():
+            targets.append(str(path))
+        else:
+            targets.extend(get_buildable_files(path_str))
+
+    # Remove duplicates
+    targets = sorted(set(targets))
+    print(f"Found {len(targets)} targets.")  # noqa: T201
+
+    failures = 0
+    for target in targets:
+        res = run_bild(target)
+
+        if res.returncode == 0:
+            print("OK")  # noqa: T201
+        else:
+            print("FAIL")  # noqa: T201
+            failures += 1
+            create_task(target, res, args.parent)
+
+    print(f"\nAudit complete. {failures} failures found.")  # noqa: T201
+    if failures > 0:
+        sys.exit(1)
+    else:
+        sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/Omni/Task.hs b/Omni/Task.hs
index a6f6bb4..d5631f7 100644
--- a/Omni/Task.hs
+++ b/Omni/Task.hs
@@ -44,7 +44,7 @@ Usage:
   task list [options]
   task ready [--json]
   task show <id> [--json]
-  task update <id> <status> [--json]
+  task update <id> <status> [options]
   task deps <id> [--json]
   task tree [<id>] [--json]
   task progress <id> [--json]
@@ -214,13 +214,30 @@ move args
   | args `Cli.has` Cli.command "update" = do
       tid <- getArgText args "id"
       statusStr <- getArgText args "status"
+
+      -- Handle update dependencies
+      deps <- do
+        -- Parse --deps and --dep-type
+        ids <- case Cli.getArg args (Cli.longOption "deps") of
+          Nothing -> pure []
+          Just depStr -> pure <| T.splitOn "," (T.pack depStr)
+        dtype <- case Cli.getArg args (Cli.longOption "dep-type") of
+          Nothing -> pure Blocks
+          Just "blocks" -> pure Blocks
+          Just "discovered-from" -> pure DiscoveredFrom
+          Just "parent-child" -> pure ParentChild
+          Just "related" -> pure Related
+          Just other -> panic <| "Invalid dependency type: " <> T.pack other <> ". Use: blocks, discovered-from, parent-child, or related"
+        pure (map (\d -> Dependency {depId = d, depType = dtype}) ids)
+
       let newStatus = case statusStr of
             "open" -> Open
             "in-progress" -> InProgress
             "review" -> Review
             "done" -> Done
             _ -> panic "Invalid status. Use: open, in-progress, review, or done"
-      updateTaskStatus tid newStatus
+
+      updateTaskStatus tid newStatus deps
       if isJsonMode args
         then outputSuccess <| "Updated task " <> tid
         else do
diff --git a/Omni/Task/Core.hs b/Omni/Task/Core.hs
index 7bb8ef0..29aca85 100644
--- a/Omni/Task/Core.hs
+++ b/Omni/Task/Core.hs
@@ -367,15 +367,15 @@ createTask title taskType parent namespace priority deps description =
     pure task
 
 -- Update task status
-updateTaskStatus :: Text -> Status -> IO ()
-updateTaskStatus tid newStatus =
+updateTaskStatus :: Text -> Status -> [Dependency] -> IO ()
+updateTaskStatus tid newStatus newDeps =
   withTaskWriteLock <| do
     tasks <- loadTasksInternal
     now <- getCurrentTime
     let updatedTasks = map updateIfMatch tasks
         updateIfMatch t =
           if matchesId (taskId t) tid
-            then t {taskStatus = newStatus, taskUpdatedAt = now}
+            then t {taskStatus = newStatus, taskUpdatedAt = now, taskDependencies = if null newDeps then taskDependencies t else newDeps}
             else t
     -- Rewrite the entire file (simple approach for MVP)
     tasksFile <- getTasksFilePath