fix: Two parallel activation paths for llama agents (ENABLE_LLAMA_AGENT vs [agents.X] TOML) (#846)
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
ci/woodpecker/push/nomad-validate Pipeline was successful
ci/woodpecker/pr/ci Pipeline was successful
ci/woodpecker/pr/nomad-validate Pipeline was successful
ci/woodpecker/pr/secret-scan Pipeline was successful
ci/woodpecker/pr/smoke-init Pipeline was successful
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
ci/woodpecker/push/nomad-validate Pipeline was successful
ci/woodpecker/pr/ci Pipeline was successful
ci/woodpecker/pr/nomad-validate Pipeline was successful
ci/woodpecker/pr/secret-scan Pipeline was successful
ci/woodpecker/pr/smoke-init Pipeline was successful
- Remove ENABLE_LLAMA_AGENT conditional block from docker-compose generation - Remove legacy agents-llama and agents-llama-all services from docker-compose.yml - Remove llama bot user creation code (dev-qwen, dev-qwen-nightly) from lib/forge-setup.sh - Remove FORGE_TOKEN_LLAMA/FORGE_PASS_LLAMA environment variables from .env.example - Add migration error check that fails when ENABLE_LLAMA_AGENT=1 is found in .env - Update documentation: remove agents-llama entries from AGENTS.md and lib/AGENTS.md - Delete docs/agents-llama.md (legacy documentation) - TOML [agents.X] sections in projects/*.toml is now the canonical activation path
This commit is contained in:
parent
016d4fe8cc
commit
5c2d934759
8 changed files with 31 additions and 519 deletions
33
bin/disinto
33
bin/disinto
|
|
@ -396,15 +396,16 @@ check_pipeline_stall = false
|
|||
# for local LLM inference. Each agent gets its own container with isolated
|
||||
# credentials and configuration.
|
||||
#
|
||||
# [agents.llama]
|
||||
# base_url = "http://10.10.10.1:8081"
|
||||
# model = "unsloth/Qwen3.5-35B-A3B"
|
||||
# api_key = "sk-no-key-required"
|
||||
# roles = ["dev"]
|
||||
# forge_user = "dev-qwen"
|
||||
# compact_pct = 60
|
||||
# poll_interval = 60
|
||||
|
||||
# Configure via [agents.X] sections:
|
||||
# [agents.dev-qwen]
|
||||
# base_url = "http://10.10.10.1:8081"
|
||||
# model = "unsloth/Qwen3.5-35B-A3B"
|
||||
# api_key = "sk-no-key-required"
|
||||
# roles = ["dev"]
|
||||
# forge_user = "dev-qwen"
|
||||
# compact_pct = 60
|
||||
# poll_interval = 60
|
||||
#
|
||||
# [mirrors]
|
||||
# github = "git@github.com:user/repo.git"
|
||||
# codeberg = "git@codeberg.org:user/repo.git"
|
||||
|
|
@ -882,7 +883,6 @@ p.write_text(text)
|
|||
echo ""
|
||||
echo "[ensure] Forgejo admin user 'disinto-admin'"
|
||||
echo "[ensure] 8 bot users: dev-bot, review-bot, planner-bot, gardener-bot, vault-bot, supervisor-bot, predictor-bot, architect-bot"
|
||||
echo "[ensure] 2 llama bot users: dev-qwen, dev-qwen-nightly"
|
||||
echo "[ensure] .profile repos for all bots"
|
||||
echo "[ensure] repo ${forge_repo} on Forgejo with collaborators"
|
||||
echo "[run] preflight checks"
|
||||
|
|
@ -1078,19 +1078,6 @@ p.write_text(text)
|
|||
echo "Config: CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 saved to .env"
|
||||
fi
|
||||
|
||||
# Write local-Qwen dev agent env keys with safe defaults (#769)
|
||||
if ! grep -q '^ENABLE_LLAMA_AGENT=' "$env_file" 2>/dev/null; then
|
||||
cat >> "$env_file" <<'LLAMAENVEOF'
|
||||
|
||||
# Local Qwen dev agent (optional) — set to 1 to enable
|
||||
ENABLE_LLAMA_AGENT=0
|
||||
FORGE_TOKEN_LLAMA=
|
||||
FORGE_PASS_LLAMA=
|
||||
ANTHROPIC_BASE_URL=
|
||||
LLAMAENVEOF
|
||||
echo "Config: ENABLE_LLAMA_AGENT keys written to .env (disabled by default)"
|
||||
fi
|
||||
|
||||
# Create labels on remote
|
||||
create_labels "$forge_repo" "$forge_url"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue