From bba7665e092bd07544be08f8c53b46177a890c14 Mon Sep 17 00:00:00 2001
From: Agent <agent@example.com>
Date: Tue, 7 Apr 2026 11:40:24 +0000
Subject: [PATCH] fix: fix: entrypoint-llama.sh should reset base repo to
 origin/main on startup (#336)

---
 docker/agents/entrypoint-llama.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docker/agents/entrypoint-llama.sh b/docker/agents/entrypoint-llama.sh
index eeaaa02..2eb8edd 100755
--- a/docker/agents/entrypoint-llama.sh
+++ b/docker/agents/entrypoint-llama.sh
@@ -28,6 +28,15 @@ if [ ! -d "${PROJECT_REPO_ROOT}/.git" ]; then
   log "Repo cloned"
 fi
 
+# Reset base repo to origin/main to avoid divergence warnings
+su -s /bin/bash agent -c "
+  cd '/home/agent/repos/disinto'
+  git fetch origin main
+  git checkout main 2>/dev/null || true
+  git reset --hard origin/main
+"
+log "Base repo reset to origin/main"
+
 log "Entering poll loop (interval: ${POLL_INTERVAL:-300}s)"
 
 while true; do