Merge branch 'live' into task/t-1ne7Qtj

6 files changed, 328 insertions, 30 deletions

diff --git a/Omni/Agent/Git.hs b/Omni/Agent/Git.hs
new file mode 100644
index 0000000..a7afb20
--- /dev/null
+++ b/Omni/Agent/Git.hs
@@ -0,0 +1,138 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+
+-- | Git operations for the agent.
+--
+-- : out omni-agent-git
+-- : dep temporary
+module Omni.Agent.Git
+  ( checkout,
+    main,
+    test,
+  )
+where
+
+import Alpha
+import qualified Data.Text as Text
+import qualified Omni.Log as Log
+import Omni.Test ((@=?))
+import qualified Omni.Test as Test
+import qualified System.Directory as Directory
+import qualified System.Exit as Exit
+import qualified System.IO.Temp as Temp
+import qualified System.Process as Process
+
+main :: IO ()
+main = Test.run test
+
+test :: Test.Tree
+test =
+  Test.group
+    "Omni.Agent.Git"
+    [ Test.unit "checkout works" <| do
+        Temp.withSystemTempDirectory "omni-agent-git-test" <| \tmpDir -> do
+          let repo = tmpDir <> "/repo"
+          Directory.createDirectory repo
+          -- init repo
+          git repo ["init"]
+          git repo ["branch", "-m", "master"]
+          git repo ["config", "user.email", "you@example.com"]
+          git repo ["config", "user.name", "Your Name"]
+
+          -- commit A
+          writeFile (repo <> "/a.txt") "A"
+          git repo ["add", "a.txt"]
+          git repo ["commit", "-m", "A"]
+          shaA <- getSha repo "HEAD"
+
+          -- create branch dev
+          git repo ["checkout", "-b", "dev"]
+
+          -- commit B
+          writeFile (repo <> "/b.txt") "B"
+          git repo ["add", "b.txt"]
+          git repo ["commit", "-m", "B"]
+          shaB <- getSha repo "HEAD"
+
+          -- switch back to master
+          git repo ["checkout", "master"]
+
+          -- Test 1: checkout dev
+          checkout repo "dev"
+          current <- getSha repo "HEAD"
+          shaB @=? current
+
+          -- Test 2: checkout master
+          checkout repo "master"
+          current' <- getSha repo "HEAD"
+          shaA @=? current'
+
+          -- Test 3: dirty state
+          writeFile (repo <> "/a.txt") "DIRTY"
+          checkout repo "dev"
+          current'' <- getSha repo "HEAD"
+          shaB @=? current''
+          -- Verify dirty file is gone/overwritten (b.txt should exist, a.txt should be A from master? No, a.txt is in A and B)
+          -- Wait, in dev, a.txt is "A".
+          content <- readFile (repo <> "/a.txt")
+          "A" @=? content
+
+          -- Test 4: untracked file
+          writeFile (repo <> "/untracked.txt") "DELETE ME"
+          checkout repo "master"
+          exists <- Directory.doesFileExist (repo <> "/untracked.txt")
+          False @=? exists
+    ]
+
+getSha :: FilePath -> String -> IO String
+getSha dir ref = do
+  let cmd = (Process.proc "git" ["rev-parse", ref]) {Process.cwd = Just dir}
+  (code, out, _) <- Process.readCreateProcessWithExitCode cmd ""
+  case code of
+    Exit.ExitSuccess -> pure <| strip out
+    _ -> panic "getSha failed"
+
+-- | Checkout a specific ref (SHA, branch, tag) in the given repository path.
+-- This function ensures the repository is in the correct state by:
+-- 1. Fetching all updates
+-- 2. Checking out the ref (forcing overwrites of local changes)
+-- 3. Resetting hard to the ref (to ensure clean state)
+-- 4. Cleaning untracked files
+-- 5. Updating submodules
+checkout :: FilePath -> Text -> IO ()
+checkout repoPath ref = do
+  let r = Text.unpack ref
+
+  Log.info ["git", "checkout", ref, "in", Text.pack repoPath]
+
+  -- Fetch all refs to ensure we have the target
+  git repoPath ["fetch", "--all", "--tags"]
+
+  -- Checkout the ref, discarding local changes
+  git repoPath ["checkout", "--force", r]
+
+  -- Reset hard to ensure we are exactly at the target state
+  git repoPath ["reset", "--hard", r]
+
+  -- Remove untracked files and directories
+  git repoPath ["clean", "-fdx"]
+
+  -- Update submodules
+  git repoPath ["submodule", "update", "--init", "--recursive"]
+
+  Log.good ["git", "checkout", "complete"]
+  Log.br
+
+-- | Run a git command in the given directory.
+git :: FilePath -> [String] -> IO ()
+git dir args = do
+  let cmd = (Process.proc "git" args) {Process.cwd = Just dir}
+  (exitCode, out, err) <- Process.readCreateProcessWithExitCode cmd ""
+  case exitCode of
+    Exit.ExitSuccess -> pure ()
+    Exit.ExitFailure code -> do
+      Log.fail ["git command failed", Text.pack (show args), "code: " <> show code]
+      Log.info [Text.pack out]
+      Log.info [Text.pack err]
+      Log.br
+      panic <| "git command failed: git " <> show args
diff --git a/Omni/Agent/Log.hs b/Omni/Agent/Log.hs
new file mode 100644
index 0000000..c93479b
--- /dev/null
+++ b/Omni/Agent/Log.hs
@@ -0,0 +1,71 @@
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+
+module Omni.Agent.Log
+  ( LogEntry (..),
+    parseLine,
+    format,
+  )
+where
+
+import Alpha
+import Data.Aeson (FromJSON (..), (.:), (.:?))
+import qualified Data.Aeson as Aeson
+import qualified Data.ByteString.Lazy as BSL
+
+data LogEntry = LogEntry
+  { leMessage :: Text,
+    leLevel :: Maybe Text,
+    leToolName :: Maybe Text,
+    leBatches :: Maybe [[Text]],
+    leMethod :: Maybe Text,
+    lePath :: Maybe Text
+  }
+  deriving (Show, Eq, Generic)
+
+instance FromJSON LogEntry where
+  parseJSON =
+    Aeson.withObject "LogEntry" <| \v ->
+      ( LogEntry
+          </ (v .: "message")
+      )
+        <*> v
+        .:? "level"
+        <*> v
+        .:? "toolName"
+        <*> v
+        .:? "batches"
+        <*> v
+        .:? "method"
+        <*> v
+        .:? "path"
+
+parseLine :: Text -> Maybe LogEntry
+parseLine line = Aeson.decode <| BSL.fromStrict <| encodeUtf8 line
+
+format :: LogEntry -> Maybe Text
+format e =
+  case leMessage e of
+    "executing 1 tools in 1 batch(es)" ->
+      let tool = case leBatches e of
+            Just ((t : _) : _) -> t
+            _ -> "unknown"
+       in Just <| "🤖  THOUGHT: Planning tool execution (" <> tool <> ")"
+    "Tool Bash permitted - action: allow" ->
+      Just "🔧  TOOL: Bash command executed"
+    msg
+      | "Processing tool completion for ledger" == msg && isJust (leToolName e) ->
+          Just <| "✅  TOOL: " <> fromMaybe "" (leToolName e) <> " completed"
+    "ide-fs" ->
+      case leMethod e of
+        Just "readFile" -> Just <| "📂  READ: " <> fromMaybe "" (lePath e)
+        _ -> Nothing
+    "System prompt build complete (no changes)" ->
+      Just "🧠  THINKING..."
+    "System prompt build complete (first build)" ->
+      Just "🚀  STARTING new task context"
+    msg ->
+      case leLevel e of
+        Just "error" -> Just <| "❌  ERROR: " <> msg
+        _ -> Nothing
diff --git a/Omni/Agent/LogTest.hs b/Omni/Agent/LogTest.hs
new file mode 100644
index 0000000..0d085b1
--- /dev/null
+++ b/Omni/Agent/LogTest.hs
@@ -0,0 +1,72 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+
+-- : out agent-log-test
+module Omni.Agent.LogTest where
+
+import Alpha
+import Omni.Agent.Log
+import qualified Omni.Test as Test
+
+main :: IO ()
+main = Test.run tests
+
+tests :: Test.Tree
+tests =
+  Test.group
+    "Omni.Agent.Log"
+    [ Test.unit "Parse LogEntry" testParse,
+      Test.unit "Format LogEntry" testFormat
+    ]
+
+testParse :: IO ()
+testParse = do
+  let json = "{\"message\": \"executing 1 tools in 1 batch(es)\", \"batches\": [[\"grep\"]]}"
+  let expected =
+        LogEntry
+          { leMessage = "executing 1 tools in 1 batch(es)",
+            leLevel = Nothing,
+            leToolName = Nothing,
+            leBatches = Just [["grep"]],
+            leMethod = Nothing,
+            lePath = Nothing
+          }
+  parseLine json @?= Just expected
+
+testFormat :: IO ()
+testFormat = do
+  let entry =
+        LogEntry
+          { leMessage = "executing 1 tools in 1 batch(es)",
+            leLevel = Nothing,
+            leToolName = Nothing,
+            leBatches = Just [["grep"]],
+            leMethod = Nothing,
+            lePath = Nothing
+          }
+  format entry @?= Just "🤖  THOUGHT: Planning tool execution (grep)"
+
+  let entry2 =
+        LogEntry
+          { leMessage = "some random log",
+            leLevel = Nothing,
+            leToolName = Nothing,
+            leBatches = Nothing,
+            leMethod = Nothing,
+            lePath = Nothing
+          }
+  format entry2 @?= Nothing
+
+  let entry3 =
+        LogEntry
+          { leMessage = "some error",
+            leLevel = Just "error",
+            leToolName = Nothing,
+            leBatches = Nothing,
+            leMethod = Nothing,
+            lePath = Nothing
+          }
+  format entry3 @?= Just "❌  ERROR: some error"
+
+(@?=) :: (Eq a, Show a) => a -> a -> IO ()
+(@?=) = (Test.@?=)
diff --git a/Omni/Agent/WORKER_AGENT_GUIDE.md b/Omni/Agent/WORKER_AGENT_GUIDE.md
index af81bb0..5bae08f 100644
--- a/Omni/Agent/WORKER_AGENT_GUIDE.md
+++ b/Omni/Agent/WORKER_AGENT_GUIDE.md
@@ -55,13 +55,10 @@ task update t-123 in-progress
 2.  **Check for Unmerged Work**: Look for dependencies that have existing branches (e.g., `task/t-parent-id`) which are NOT yet merged into `live`.
 3.  **Select Base**:
     *   If you find an unmerged dependency branch, check it out: `git checkout task/t-parent-id`.
-    *   Otherwise, start from fresh live code: `git checkout omni-worker-1` (which tracks `live`).
+    *   Otherwise, start from fresh live code: `git fetch origin live && git checkout -b task/t-123 origin/live`.
 
-4.  **Create/Checkout Feature Branch**:
-    ```bash
-    # Try to switch to existing branch, otherwise create new one
-    git checkout task/t-123 || git checkout -b task/t-123
-    ```
+4.  **Implement**:
+    (Proceed to implementation)
 
 ### Step 4: Implement
 
@@ -70,29 +67,35 @@ task update t-123 in-progress
 3.  **Run Tests**: `bild --test Omni/YourNamespace.hs`
 
 ### Step 5: Submit for Review
-
-1.  **Commit Implementation**:
-    ```bash
-    git add .
-    git commit -m "feat: implement t-123"
-    ```
-
-2.  **Signal Review Readiness**:
-    The Planner checks the `omni-worker-X` branch for status updates. You must switch back and update the status there.
-
-    ```bash
-    # Switch to base branch
-    git checkout omni-worker-1
-    
-    # Sync to get latest state (and any manual merges)
-    ./Omni/Agent/sync-tasks.sh
-    
-    # Mark task for review
-    task update t-123 review
-    
-    # Commit this status change to the worker branch
-    ./Omni/Agent/sync-tasks.sh --commit
-    ```
+ 
+ 1.  **Update Status and Commit**:
+     Bundle the task status update with your implementation to keep history clean.
+ 
+     ```bash
+     # 1. Mark task for review (updates .tasks/tasks.jsonl)
+     task update t-123 review
+ 
+     # 2. Commit changes + task update
+     git add .
+     git commit -m "feat: implement t-123"
+     ```
+ 
+ 2.  **Signal Review Readiness**:
+     Update the worker branch to signal the planner.
+ 
+     ```bash
+     # Switch to base branch
+     git checkout omni-worker-1
+     
+     # Sync to get latest state
+     ./Omni/Agent/sync-tasks.sh
+     
+     # Ensure the task is marked review here too (for harvest visibility)
+     task update t-123 review
+     
+     # Commit this status change to the worker branch
+     ./Omni/Agent/sync-tasks.sh --commit
+     ```
 
     *Note: The Planner will now see 't-123' in 'Review' when it runs `harvest-tasks.sh`.*
 
diff --git a/Omni/Agent/harvest-tasks.sh b/Omni/Agent/harvest-tasks.sh
index 282beab..44c2322 100755
--- a/Omni/Agent/harvest-tasks.sh
+++ b/Omni/Agent/harvest-tasks.sh
@@ -45,7 +45,14 @@ if [ "$UPDATED" -eq 1 ]; then
     # Commit if there are changes
     if [[ -n $(git status --porcelain .tasks/tasks.jsonl) ]]; then
         git add .tasks/tasks.jsonl
-        git commit -m "task: harvest updates from workers"
+        
+        LAST_MSG=$(git log -1 --pretty=%s)
+        if [[ "$LAST_MSG" == "task: harvest updates from workers" ]]; then
+            echo "Squashing with previous harvest commit..."
+            git commit --amend --no-edit
+        else
+            git commit -m "task: harvest updates from workers"
+        fi
         echo "Success: Task database updated and committed."
     else
         echo "No effective changes found."
diff --git a/Omni/Agent/setup-worker.sh b/Omni/Agent/setup-worker.sh
index 28c29b1..42b7fc9 100755
--- a/Omni/Agent/setup-worker.sh
+++ b/Omni/Agent/setup-worker.sh
@@ -22,3 +22,10 @@ if [ -f "$REPO_ROOT/.envrc.local" ]; then
     echo "Copying .envrc.local..."
     cp "$REPO_ROOT/.envrc.local" "$WORKTREE_PATH/"
 fi
+
+# Configure git identity for the worker
+echo "Configuring git identity for worker..."
+git -C "$WORKTREE_PATH" config user.name "Omni Worker"
+git -C "$WORKTREE_PATH" config user.email "bot@omni.agent"
+
+echo "Worker setup complete at $WORKTREE_PATH"