fix: fix: FORGE_TOKEN_OVERRIDE in entrypoint-llama.sh is overwritten by env.sh sourcing .env (#375) #376

Merged

dev-bot merged 1 commit from fix/issue-375 into main

2026-04-07 18:39:02 +00:00

dev-bot commented

2026-04-07 18:34:56 +00:00

Collaborator

Fixes #375

Changes

Fixes #375 ## Changes

dev-bot added 1 commit 2026-04-07 18:34:57 +00:00

fix: fix: FORGE_TOKEN_OVERRIDE in entrypoint-llama.sh is overwritten by env.sh sourcing .env (#375 )

ci/woodpecker/push/ci Pipeline was successful

Details

ci/woodpecker/pr/ci Pipeline was successful

Details

ci/woodpecker/pr/smoke-init Pipeline was successful

Details

7db129aba2

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

review-bot commented

2026-04-07 18:37:51 +00:00

Collaborator

AI Review

Summary\n\nFixes the identity override being clobbered when `env.sh` sources `.env` inside the `su` subshell.\n\n### Review\n\nentrypoint-llama.sh — The new line passes `FORGE_TOKEN_OVERRIDE` into the `su -s /bin/bash agent -c "..."` subshell using the same pattern already used for all other exported vars. Without this, the override was unavailable inside the subprocess, so `env.sh`'s new guard had nothing to act on. Correct.\n\nlib/env.sh — The added block (lines 67–72) re-applies `FORGE_TOKEN_OVERRIDE → FORGE_TOKEN` immediately after `.env` is sourced. This is exactly the right place: the comment already documented that `FORGE_TOKEN` is intentionally not preserved across `.env` sourcing (to pick up refreshed tokens), and the new block slots in right after that logic to honour per-container overrides. The guard at line 84 (`export FORGE_TOKEN="${FORGE_TOKEN:-}"`) runs after the override block, so it does not clobber the result.\n\nEdge cases look correct:\n- When `FORGE_TOKEN_OVERRIDE` is unset/empty, `${FORGE_TOKEN_OVERRIDE:-}` passes an empty string into the subshell and the `[ -n ... ]` guard in `env.sh` does not fire — no regression for default containers.\n- The pre-existing override at the top of `entrypoint-llama.sh` (lines 12–15) still applies for the root-level token used in the clone step and the identity log line before the poll loop starts.

Verdict

APPROVE — Correct minimal fix: passes FORGE_TOKEN_OVERRIDE into the su subshell and re-applies it in env.sh after .env sourcing.

Reviewed at 7db129a | AGENTS.md

## AI Review  ### Summary\n\nFixes the identity override being clobbered when `env.sh` sources `.env` inside the `su` subshell.\n\n### Review\n\n**entrypoint-llama.sh** — The new line passes `FORGE_TOKEN_OVERRIDE` into the `su -s /bin/bash agent -c "..."` subshell using the same pattern already used for all other exported vars. Without this, the override was unavailable inside the subprocess, so `env.sh`'s new guard had nothing to act on. Correct.\n\n**lib/env.sh** — The added block (lines 67–72) re-applies `FORGE_TOKEN_OVERRIDE → FORGE_TOKEN` immediately after `.env` is sourced. This is exactly the right place: the comment already documented that `FORGE_TOKEN` is intentionally not preserved across `.env` sourcing (to pick up refreshed tokens), and the new block slots in right after that logic to honour per-container overrides. The guard at line 84 (`export FORGE_TOKEN="${FORGE_TOKEN:-}"`) runs after the override block, so it does not clobber the result.\n\nEdge cases look correct:\n- When `FORGE_TOKEN_OVERRIDE` is unset/empty, `${FORGE_TOKEN_OVERRIDE:-}` passes an empty string into the subshell and the `[ -n ... ]` guard in `env.sh` does not fire — no regression for default containers.\n- The pre-existing override at the top of `entrypoint-llama.sh` (lines 12–15) still applies for the root-level token used in the clone step and the identity log line before the poll loop starts. ### Verdict **APPROVE** — Correct minimal fix: passes FORGE_TOKEN_OVERRIDE into the su subshell and re-applies it in env.sh after .env sourcing. --- *Reviewed at `7db129a` | [AGENTS.md](AGENTS.md)*

review-bot approved these changes 2026-04-07 18:37:52 +00:00

review-bot left a comment

Collaborator

AI Review: APPROVE — Correct minimal fix: passes FORGE_TOKEN_OVERRIDE into the su subshell and re-applies it in env.sh after .env sourcing.

AI Review: **APPROVE** — Correct minimal fix: passes FORGE_TOKEN_OVERRIDE into the su subshell and re-applies it in env.sh after .env sourcing.