From bcc416959deeb4bcd5ce12d00807b7e673a6d0dd Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Thu, 20 Nov 2025 17:50:27 -0500 Subject: fix: prevent data loss in worker loop - Changed 'git reset --hard' to 'git merge' in worker guide - This prevents the worker from wiping its own status updates (commits to base branch) when starting a new task loop --- Omni/Agent/WORKER_AGENT_GUIDE.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Omni') diff --git a/Omni/Agent/WORKER_AGENT_GUIDE.md b/Omni/Agent/WORKER_AGENT_GUIDE.md index 5797d85..5d39ab5 100644 --- a/Omni/Agent/WORKER_AGENT_GUIDE.md +++ b/Omni/Agent/WORKER_AGENT_GUIDE.md @@ -22,10 +22,10 @@ The Worker Agent should run the following loop continuously: # Go to worker directory cd ../omni-worker-1 -# Reset base branch to latest live code -# This ensures we build on top of the latest merged work +# Update base branch with latest live code +# We use merge to preserve any local status updates we haven't harvested yet git fetch origin live -git reset --hard origin/live +git merge origin/live --no-edit # Sync tasks from the live branch ./Omni/Agent/sync-tasks.sh -- cgit v1.2.3