Compare commits

..

1 commit

Author SHA1 Message Date
dev-qwen2
11f89d9b7a 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
2026-04-16 18:40:35 +00:00
4 changed files with 10 additions and 13 deletions

View file

@ -122,7 +122,8 @@ bash dev/phase-test.sh
| Reproduce | `docker/reproduce/` | Bug reproduction using Playwright MCP | `formulas/reproduce.toml` | | Reproduce | `docker/reproduce/` | Bug reproduction using Playwright MCP | `formulas/reproduce.toml` |
| Triage | `docker/reproduce/` | Deep root cause analysis | `formulas/triage.toml` | | Triage | `docker/reproduce/` | Deep root cause analysis | `formulas/triage.toml` |
| Edge dispatcher | `docker/edge/` | Polls ops repo for vault actions, executes via Claude sessions | `docker/edge/dispatcher.sh` | | Edge dispatcher | `docker/edge/` | Polls ops repo for vault actions, executes via Claude sessions | `docker/edge/dispatcher.sh` |
| Local-model agents | `docker/agents/` (same image) | Local llama-server agents configured via `[agents.X]` sections in project TOML | [docs/agents-llama.md](docs/agents-llama.md) | | agents-llama | `docker/agents/` (same image) | Local-Qwen dev agent (`AGENT_ROLES=dev`), gated on `ENABLE_LLAMA_AGENT=1` | [docs/agents-llama.md](docs/agents-llama.md) |
| agents-llama-all | `docker/agents/` (same image) | Local-Qwen all-roles agent (all 7 roles), profile `agents-llama-all` | [docs/agents-llama.md](docs/agents-llama.md) |
> **Vault:** Being redesigned as a PR-based approval workflow (issues #73-#77). > **Vault:** Being redesigned as a PR-based approval workflow (issues #73-#77).
> See [docs/VAULT.md](docs/VAULT.md) for the vault PR workflow details. > See [docs/VAULT.md](docs/VAULT.md) for the vault PR workflow details.

View file

@ -378,19 +378,15 @@ bootstrap_factory_repo
# This prevents the silent-zombie mode where the polling loop matches zero files # This prevents the silent-zombie mode where the polling loop matches zero files
# and does nothing forever. # and does nothing forever.
validate_projects_dir() { validate_projects_dir() {
# NOTE: compgen -G exits non-zero when no matches exist, so piping it through local toml_count
# `wc -l` under `set -eo pipefail` aborts the script before the FATAL branch toml_count=$(compgen -G "${DISINTO_DIR}/projects/*.toml" 2>/dev/null | wc -l)
# can log a diagnostic (#877). Use the conditional form already adopted at if [ "$toml_count" -eq 0 ]; then
# lines above (see bootstrap_factory_repo, PROJECT_NAME parsing).
if ! compgen -G "${DISINTO_DIR}/projects/*.toml" >/dev/null 2>&1; then
log "FATAL: No real .toml files found in ${DISINTO_DIR}/projects/" log "FATAL: No real .toml files found in ${DISINTO_DIR}/projects/"
log "Expected at least one project config file (e.g., disinto.toml)" log "Expected at least one project config file (e.g., disinto.toml)"
log "The directory only contains *.toml.example template files." log "The directory only contains *.toml.example template files."
log "Mount the host ./projects volume or copy real .toml files into the container." log "Mount the host ./projects volume or copy real .toml files into the container."
exit 1 exit 1
fi fi
local toml_count
toml_count=$(compgen -G "${DISINTO_DIR}/projects/*.toml" | wc -l)
log "Projects directory validated: ${toml_count} real .toml file(s) found" log "Projects directory validated: ${toml_count} real .toml file(s) found"
} }

View file

@ -178,8 +178,8 @@ log "Tagged disinto/agents:${RELEASE_VERSION}"
log "Step 6/6: Restarting agent containers" log "Step 6/6: Restarting agent containers"
docker compose stop agents 2>/dev/null || true docker compose stop agents agents-llama 2>/dev/null || true
docker compose up -d agents docker compose up -d agents agents-llama
log "Agent containers restarted" log "Agent containers restarted"
# ── Done ───────────────────────────────────────────────────────────────── # ── Done ─────────────────────────────────────────────────────────────────

View file

@ -189,10 +189,10 @@ Restart agent containers to use the new image.
- docker compose pull agents - docker compose pull agents
2. Stop and remove existing agent containers: 2. Stop and remove existing agent containers:
- docker compose down agents - docker compose down agents agents-llama 2>/dev/null || true
3. Start agents with new image: 3. Start agents with new image:
- docker compose up -d agents - docker compose up -d agents agents-llama
4. Wait for containers to be healthy: 4. Wait for containers to be healthy:
- for i in {1..30}; do - for i in {1..30}; do
@ -203,7 +203,7 @@ Restart agent containers to use the new image.
- done - done
5. Verify containers are running: 5. Verify containers are running:
- docker compose ps agents - docker compose ps agents agents-llama
6. Log restart: 6. Log restart:
- echo "Restarted agents containers" - echo "Restarted agents containers"