From 27f9da57d3a9a3005ef2bb1aa9e550c0f5dcd57c Mon Sep 17 00:00:00 2001
From: Agent <agent@example.com>
Date: Tue, 7 Apr 2026 08:25:54 +0000
Subject: [PATCH] fix: run git reset commands as agent user to avoid
 safe.directory errors (#336)

---
 docker/agents/entrypoint-llama.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docker/agents/entrypoint-llama.sh b/docker/agents/entrypoint-llama.sh
index 2e1e23e..2eb8edd 100755
--- a/docker/agents/entrypoint-llama.sh
+++ b/docker/agents/entrypoint-llama.sh
@@ -29,10 +29,12 @@ if [ ! -d "${PROJECT_REPO_ROOT}/.git" ]; then
 fi
 
 # Reset base repo to origin/main to avoid divergence warnings
-cd "$PROJECT_REPO_ROOT"
-git fetch origin main
-git checkout main 2>/dev/null || true
-git reset --hard origin/main
+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)"