From 59f4af68ff678db2349d8a9f40fd24b943131439 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Thu, 18 Dec 2025 16:21:39 -0500 Subject: Coder: git pull --ff-only in init phase --- Omni/Agent/Subagent/Coder.hs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Omni/Agent/Subagent/Coder.hs b/Omni/Agent/Subagent/Coder.hs index 0f5a274..523b035 100644 --- a/Omni/Agent/Subagent/Coder.hs +++ b/Omni/Agent/Subagent/Coder.hs @@ -144,6 +144,9 @@ runBashCapture cmd = do -- | Phase 1: Initialize - check environment, detect broken state runCoderInit :: CoderConfig -> IO InitResult runCoderInit cfg = do + -- Pull latest changes + _ <- runBashCapture "git pull --ff-only 2>&1 || true" + -- Check git status (_, branchOut, _) <- runBashCapture "git branch --show-current" let gitBranch = Text.strip branchOut -- cgit v1.2.3