fix: entrypoint-llama.sh should reset base repo to origin/main on startup #336

New issue

Closed

opened 2026-04-07 08:02:58 +00:00 by dev-bot · 1 comment

dev-bot commented

2026-04-07 08:02:58 +00:00

Collaborator

Problem

The base repo at /home/agent/repos/disinto inside the agents-llama container drifts from main over time. After dev-agent runs create worktrees from branches, the base repo can end up on a stale branch. This produces noisy warnings on every poll cycle:

Your branch and 'origin/main' have diverged,
and have 64 and 29 different commits each, respectively.

Worktrees are unaffected (they fetch from origin/main directly), but the drift is confusing and could cause issues if anything uses the base repo directly.

Fix

Add a reset to main at the start of entrypoint-llama.sh, after the repo clone check:

cd "$PROJECT_REPO_ROOT"
git fetch origin main
git checkout main 2>/dev/null || true
git reset --hard origin/main

Affected files

docker/agents/entrypoint-llama.sh (add reset after repo clone block)

Acceptance criteria

Base repo is on origin/main after container startup
No divergence warnings in poll logs

CI note (from prior failed attempt)

The agent-smoke.sh CI step checks function resolution — every function called in agent scripts must be defined in the script itself or in a lib/ file listed in LIB_FUNS (.woodpecker/agent-smoke.sh line 113). The prior PR failed because the branch was rebased incorrectly and carried 85 stale commits.

The actual change is small (only docker/agents/entrypoint-llama.sh). Do NOT modify .woodpecker/agent-smoke.sh or lib/ files. Just edit entrypoint-llama.sh and verify with: bash .woodpecker/agent-smoke.sh

## Problem The base repo at /home/agent/repos/disinto inside the agents-llama container drifts from main over time. After dev-agent runs create worktrees from branches, the base repo can end up on a stale branch. This produces noisy warnings on every poll cycle: Your branch and 'origin/main' have diverged, and have 64 and 29 different commits each, respectively. Worktrees are unaffected (they fetch from origin/main directly), but the drift is confusing and could cause issues if anything uses the base repo directly. ## Fix Add a reset to main at the start of entrypoint-llama.sh, after the repo clone check: cd "$PROJECT_REPO_ROOT" git fetch origin main git checkout main 2>/dev/null || true git reset --hard origin/main ## Affected files - docker/agents/entrypoint-llama.sh (add reset after repo clone block) ## Acceptance criteria - [ ] Base repo is on origin/main after container startup - [ ] No divergence warnings in poll logs ## CI note (from prior failed attempt) The agent-smoke.sh CI step checks function resolution — every function called in agent scripts must be defined in the script itself or in a lib/ file listed in LIB_FUNS (.woodpecker/agent-smoke.sh line 113). The prior PR failed because the branch was rebased incorrectly and carried 85 stale commits. The actual change is small (only docker/agents/entrypoint-llama.sh). Do NOT modify .woodpecker/agent-smoke.sh or lib/ files. Just edit entrypoint-llama.sh and verify with: bash .woodpecker/agent-smoke.sh