From 7db129aba26b2a3e1e3e652373ee18863cf89502 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 7 Apr 2026 18:34:45 +0000
Subject: [PATCH] fix: fix: FORGE_TOKEN_OVERRIDE in entrypoint-llama.sh is
 overwritten by env.sh sourcing .env (#375)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 docker/agents/entrypoint-llama.sh | 1 +
 lib/env.sh                        | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/docker/agents/entrypoint-llama.sh b/docker/agents/entrypoint-llama.sh
index fa2c6ed..c600775 100755
--- a/docker/agents/entrypoint-llama.sh
+++ b/docker/agents/entrypoint-llama.sh
@@ -48,6 +48,7 @@ while true; do
 
   su -s /bin/bash agent -c "
     export FORGE_TOKEN='${FORGE_TOKEN}'
+    export FORGE_TOKEN_OVERRIDE='${FORGE_TOKEN_OVERRIDE:-}'
     export ANTHROPIC_API_KEY='${ANTHROPIC_API_KEY:-}'
     export ANTHROPIC_BASE_URL='${ANTHROPIC_BASE_URL:-}'
     export CLAUDE_CONFIG_DIR='${CLAUDE_CONFIG_DIR:-}'
diff --git a/lib/env.sh b/lib/env.sh
index 58c4181..7a82619 100755
--- a/lib/env.sh
+++ b/lib/env.sh
@@ -64,6 +64,13 @@ elif [ -f "$FACTORY_ROOT/.env" ]; then
   [ -n "$_saved_forge_url" ] && export FORGE_URL="$_saved_forge_url"
 fi
 
+# Allow per-container token override (#375): .env sets the default FORGE_TOKEN
+# (dev-bot), then FORGE_TOKEN_OVERRIDE replaces it for containers that need a
+# different Forgejo identity (e.g. dev-qwen).
+if [ -n "${FORGE_TOKEN_OVERRIDE:-}" ]; then
+  export FORGE_TOKEN="$FORGE_TOKEN_OVERRIDE"
+fi
+
 # PATH: foundry, node, system
 export PATH="${HOME}/.local/bin:${HOME}/.foundry/bin:${HOME}/.nvm/versions/node/v22.20.0/bin:/usr/local/bin:/usr/bin:/bin:${PATH}"
 export HOME="${HOME:-/home/debian}"