2026-03-21 00:22:37 +00:00
|
|
|
#!/usr/bin/env bash
|
|
|
|
|
# =============================================================================
|
fix: Migrate planner, predictor, supervisor to SDK (#6)
Replace tmux-based run_formula_and_monitor() with synchronous agent_run()
from lib/agent-sdk.sh, matching the pattern established in gardener-run.sh.
Key changes per agent:
- Drop agent-session.sh, use agent-sdk.sh (SID_FILE, LOGFILE)
- Remove SESSION_NAME, PHASE_FILE, PHASE_POLL_INTERVAL (tmux/phase artifacts)
- Strip phase protocol from prompt footer (SDK mode needs no phase signals)
- Preserve all prompt composition: context blocks, memory, journal, preflight
Shared helpers added to lib/formula-session.sh:
- build_sdk_prompt_footer(): build_prompt_footer minus phase protocol
- formula_worktree_setup(): fetch + cleanup + create worktree + EXIT trap
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-28 13:06:34 +00:00
|
|
|
# supervisor-run.sh — Cron wrapper: supervisor execution via SDK + formula
|
2026-03-21 00:22:37 +00:00
|
|
|
#
|
fix: Migrate planner, predictor, supervisor to SDK (#6)
Replace tmux-based run_formula_and_monitor() with synchronous agent_run()
from lib/agent-sdk.sh, matching the pattern established in gardener-run.sh.
Key changes per agent:
- Drop agent-session.sh, use agent-sdk.sh (SID_FILE, LOGFILE)
- Remove SESSION_NAME, PHASE_FILE, PHASE_POLL_INTERVAL (tmux/phase artifacts)
- Strip phase protocol from prompt footer (SDK mode needs no phase signals)
- Preserve all prompt composition: context blocks, memory, journal, preflight
Shared helpers added to lib/formula-session.sh:
- build_sdk_prompt_footer(): build_prompt_footer minus phase protocol
- formula_worktree_setup(): fetch + cleanup + create worktree + EXIT trap
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-28 13:06:34 +00:00
|
|
|
# Synchronous bash loop using claude -p (one-shot invocation).
|
|
|
|
|
# No tmux sessions, no phase files — the bash script IS the state machine.
|
2026-03-21 00:22:37 +00:00
|
|
|
#
|
fix: Migrate planner, predictor, supervisor to SDK (#6)
Replace tmux-based run_formula_and_monitor() with synchronous agent_run()
from lib/agent-sdk.sh, matching the pattern established in gardener-run.sh.
Key changes per agent:
- Drop agent-session.sh, use agent-sdk.sh (SID_FILE, LOGFILE)
- Remove SESSION_NAME, PHASE_FILE, PHASE_POLL_INTERVAL (tmux/phase artifacts)
- Strip phase protocol from prompt footer (SDK mode needs no phase signals)
- Preserve all prompt composition: context blocks, memory, journal, preflight
Shared helpers added to lib/formula-session.sh:
- build_sdk_prompt_footer(): build_prompt_footer minus phase protocol
- formula_worktree_setup(): fetch + cleanup + create worktree + EXIT trap
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-28 13:06:34 +00:00
|
|
|
# Flow:
|
|
|
|
|
# 1. Guards: cron lock, memory check
|
|
|
|
|
# 2. Housekeeping: clean up stale crashed worktrees
|
|
|
|
|
# 3. Collect pre-flight metrics (supervisor/preflight.sh)
|
|
|
|
|
# 4. Load formula (formulas/run-supervisor.toml)
|
|
|
|
|
# 5. Context: AGENTS.md, preflight metrics, structural graph
|
|
|
|
|
# 6. agent_run(worktree, prompt) → Claude monitors, may clean up
|
2026-03-21 00:22:37 +00:00
|
|
|
#
|
|
|
|
|
# Usage:
|
|
|
|
|
# supervisor-run.sh [projects/disinto.toml] # project config (default: disinto)
|
|
|
|
|
#
|
|
|
|
|
# Cron: */20 * * * * cd /path/to/dark-factory && bash supervisor/supervisor-run.sh
|
|
|
|
|
# =============================================================================
|
|
|
|
|
set -euo pipefail
|
|
|
|
|
|
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
|
|
|
FACTORY_ROOT="$(dirname "$SCRIPT_DIR")"
|
|
|
|
|
|
|
|
|
|
# Accept project config from argument; default to disinto
|
|
|
|
|
export PROJECT_TOML="${1:-$FACTORY_ROOT/projects/disinto.toml}"
|
|
|
|
|
# shellcheck source=../lib/env.sh
|
|
|
|
|
source "$FACTORY_ROOT/lib/env.sh"
|
fix: Per-agent Forgejo accounts — identity and permissions via authorship (#747)
Each agent now gets its own Forgejo account (dev-bot, review-bot,
planner-bot, gardener-bot, vault-bot, supervisor-bot, predictor-bot,
action-bot) with a dedicated API token. This enables:
- Audit trail: every forge action attributable to a specific agent
- Permission boundaries: agents act under their own identity
- Vault authorization model: vault-bot comments = proof of approval
Changes:
- bin/disinto: setup_forge() creates all 8 bot accounts during init,
stores per-agent tokens (FORGE_*_TOKEN) in .env, adds all bots as
repo collaborators
- lib/env.sh: exports per-agent token vars with fallback to FORGE_TOKEN
for backwards compat; sets FORGE_BOT_USERNAMES default to all 8 bots
- Agent scripts: each agent overrides FORGE_TOKEN with its per-agent
token after sourcing env.sh (gardener, planner, supervisor, predictor,
vault, action)
- .env.example: documents all per-agent token fields
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-26 16:16:13 +00:00
|
|
|
# Use supervisor-bot's own Forgejo identity (#747)
|
|
|
|
|
FORGE_TOKEN="${FORGE_SUPERVISOR_TOKEN:-${FORGE_TOKEN}}"
|
2026-03-21 00:22:37 +00:00
|
|
|
# shellcheck source=../lib/formula-session.sh
|
|
|
|
|
source "$FACTORY_ROOT/lib/formula-session.sh"
|
2026-03-27 19:06:31 +00:00
|
|
|
# shellcheck source=../lib/worktree.sh
|
|
|
|
|
source "$FACTORY_ROOT/lib/worktree.sh"
|
2026-03-23 21:46:59 +00:00
|
|
|
# shellcheck source=../lib/guard.sh
|
|
|
|
|
source "$FACTORY_ROOT/lib/guard.sh"
|
fix: Migrate planner, predictor, supervisor to SDK (#6)
Replace tmux-based run_formula_and_monitor() with synchronous agent_run()
from lib/agent-sdk.sh, matching the pattern established in gardener-run.sh.
Key changes per agent:
- Drop agent-session.sh, use agent-sdk.sh (SID_FILE, LOGFILE)
- Remove SESSION_NAME, PHASE_FILE, PHASE_POLL_INTERVAL (tmux/phase artifacts)
- Strip phase protocol from prompt footer (SDK mode needs no phase signals)
- Preserve all prompt composition: context blocks, memory, journal, preflight
Shared helpers added to lib/formula-session.sh:
- build_sdk_prompt_footer(): build_prompt_footer minus phase protocol
- formula_worktree_setup(): fetch + cleanup + create worktree + EXIT trap
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-28 13:06:34 +00:00
|
|
|
# shellcheck source=../lib/agent-sdk.sh
|
|
|
|
|
source "$FACTORY_ROOT/lib/agent-sdk.sh"
|
2026-03-21 00:22:37 +00:00
|
|
|
|
|
|
|
|
LOG_FILE="$SCRIPT_DIR/supervisor.log"
|
fix: Migrate planner, predictor, supervisor to SDK (#6)
Replace tmux-based run_formula_and_monitor() with synchronous agent_run()
from lib/agent-sdk.sh, matching the pattern established in gardener-run.sh.
Key changes per agent:
- Drop agent-session.sh, use agent-sdk.sh (SID_FILE, LOGFILE)
- Remove SESSION_NAME, PHASE_FILE, PHASE_POLL_INTERVAL (tmux/phase artifacts)
- Strip phase protocol from prompt footer (SDK mode needs no phase signals)
- Preserve all prompt composition: context blocks, memory, journal, preflight
Shared helpers added to lib/formula-session.sh:
- build_sdk_prompt_footer(): build_prompt_footer minus phase protocol
- formula_worktree_setup(): fetch + cleanup + create worktree + EXIT trap
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-28 13:06:34 +00:00
|
|
|
# shellcheck disable=SC2034 # consumed by agent-sdk.sh
|
|
|
|
|
LOGFILE="$LOG_FILE"
|
|
|
|
|
# shellcheck disable=SC2034 # consumed by agent-sdk.sh
|
|
|
|
|
SID_FILE="/tmp/supervisor-session-${PROJECT_NAME}.sid"
|
2026-03-21 00:22:37 +00:00
|
|
|
SCRATCH_FILE="/tmp/supervisor-${PROJECT_NAME}-scratch.md"
|
fix: Migrate planner, predictor, supervisor to SDK (#6)
Replace tmux-based run_formula_and_monitor() with synchronous agent_run()
from lib/agent-sdk.sh, matching the pattern established in gardener-run.sh.
Key changes per agent:
- Drop agent-session.sh, use agent-sdk.sh (SID_FILE, LOGFILE)
- Remove SESSION_NAME, PHASE_FILE, PHASE_POLL_INTERVAL (tmux/phase artifacts)
- Strip phase protocol from prompt footer (SDK mode needs no phase signals)
- Preserve all prompt composition: context blocks, memory, journal, preflight
Shared helpers added to lib/formula-session.sh:
- build_sdk_prompt_footer(): build_prompt_footer minus phase protocol
- formula_worktree_setup(): fetch + cleanup + create worktree + EXIT trap
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-28 13:06:34 +00:00
|
|
|
WORKTREE="/tmp/${PROJECT_NAME}-supervisor-run"
|
2026-03-21 00:22:37 +00:00
|
|
|
|
|
|
|
|
log() { echo "[$(date -u +%Y-%m-%dT%H:%M:%S)Z] $*" >> "$LOG_FILE"; }
|
|
|
|
|
|
|
|
|
|
# ── Guards ────────────────────────────────────────────────────────────────
|
2026-03-23 21:46:59 +00:00
|
|
|
check_active supervisor
|
2026-03-21 00:22:37 +00:00
|
|
|
acquire_cron_lock "/tmp/supervisor-run.lock"
|
|
|
|
|
check_memory 2000
|
|
|
|
|
|
|
|
|
|
log "--- Supervisor run start ---"
|
|
|
|
|
|
2026-03-26 13:41:33 +00:00
|
|
|
# ── Housekeeping: clean up stale crashed worktrees (>24h) ────────────────
|
|
|
|
|
cleanup_stale_crashed_worktrees 24
|
|
|
|
|
|
2026-04-01 14:16:13 +00:00
|
|
|
# ── Resolve agent identity for .profile repo ────────────────────────────
|
|
|
|
|
if [ -z "${AGENT_IDENTITY:-}" ] && [ -n "${FORGE_SUPERVISOR_TOKEN:-}" ]; then
|
|
|
|
|
AGENT_IDENTITY=$(curl -sf -H "Authorization: token ${FORGE_SUPERVISOR_TOKEN}" \
|
|
|
|
|
"${FORGE_URL:-http://localhost:3000}/api/v1/user" 2>/dev/null | jq -r '.login // empty' 2>/dev/null || true)
|
|
|
|
|
fi
|
|
|
|
|
|
2026-03-21 00:22:37 +00:00
|
|
|
# ── Collect pre-flight metrics ────────────────────────────────────────────
|
|
|
|
|
log "Running preflight.sh"
|
|
|
|
|
PREFLIGHT_OUTPUT=""
|
|
|
|
|
if PREFLIGHT_OUTPUT=$(bash "$SCRIPT_DIR/preflight.sh" "$PROJECT_TOML" 2>&1); then
|
|
|
|
|
log "Preflight collected ($(echo "$PREFLIGHT_OUTPUT" | wc -l) lines)"
|
|
|
|
|
else
|
|
|
|
|
log "WARNING: preflight.sh failed, continuing with partial data"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# ── Load formula + context ───────────────────────────────────────────────
|
2026-04-01 14:16:13 +00:00
|
|
|
load_formula_or_profile "supervisor" "$FACTORY_ROOT/formulas/run-supervisor.toml" || exit 1
|
2026-03-21 00:22:37 +00:00
|
|
|
build_context_block AGENTS.md
|
|
|
|
|
|
2026-04-01 14:16:13 +00:00
|
|
|
# ── Prepare .profile context (lessons injection) ─────────────────────────
|
|
|
|
|
formula_prepare_profile_context
|
|
|
|
|
|
2026-03-21 00:22:37 +00:00
|
|
|
# ── Read scratch file (compaction survival) ───────────────────────────────
|
|
|
|
|
SCRATCH_CONTEXT=$(read_scratch_context "$SCRATCH_FILE")
|
|
|
|
|
SCRATCH_INSTRUCTION=$(build_scratch_instruction "$SCRATCH_FILE")
|
|
|
|
|
|
|
|
|
|
# ── Build prompt ─────────────────────────────────────────────────────────
|
fix: Migrate planner, predictor, supervisor to SDK (#6)
Replace tmux-based run_formula_and_monitor() with synchronous agent_run()
from lib/agent-sdk.sh, matching the pattern established in gardener-run.sh.
Key changes per agent:
- Drop agent-session.sh, use agent-sdk.sh (SID_FILE, LOGFILE)
- Remove SESSION_NAME, PHASE_FILE, PHASE_POLL_INTERVAL (tmux/phase artifacts)
- Strip phase protocol from prompt footer (SDK mode needs no phase signals)
- Preserve all prompt composition: context blocks, memory, journal, preflight
Shared helpers added to lib/formula-session.sh:
- build_sdk_prompt_footer(): build_prompt_footer minus phase protocol
- formula_worktree_setup(): fetch + cleanup + create worktree + EXIT trap
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-28 13:06:34 +00:00
|
|
|
build_sdk_prompt_footer
|
|
|
|
|
export CLAUDE_MODEL="sonnet"
|
2026-03-21 00:22:37 +00:00
|
|
|
|
fix: Migrate planner, predictor, supervisor to SDK (#6)
Replace tmux-based run_formula_and_monitor() with synchronous agent_run()
from lib/agent-sdk.sh, matching the pattern established in gardener-run.sh.
Key changes per agent:
- Drop agent-session.sh, use agent-sdk.sh (SID_FILE, LOGFILE)
- Remove SESSION_NAME, PHASE_FILE, PHASE_POLL_INTERVAL (tmux/phase artifacts)
- Strip phase protocol from prompt footer (SDK mode needs no phase signals)
- Preserve all prompt composition: context blocks, memory, journal, preflight
Shared helpers added to lib/formula-session.sh:
- build_sdk_prompt_footer(): build_prompt_footer minus phase protocol
- formula_worktree_setup(): fetch + cleanup + create worktree + EXIT trap
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-28 13:06:34 +00:00
|
|
|
# ── Create worktree (before prompt assembly so trap is set early) ────────
|
|
|
|
|
formula_worktree_setup "$WORKTREE"
|
|
|
|
|
|
|
|
|
|
PROMPT="You are the supervisor agent for ${FORGE_REPO}. Work through the formula below.
|
2026-03-21 00:22:37 +00:00
|
|
|
|
|
|
|
|
You have full shell access and --dangerously-skip-permissions.
|
2026-03-26 09:09:58 +00:00
|
|
|
Fix what you can. File vault items for what you cannot. Do NOT ask permission — act first, report after.
|
2026-03-21 00:22:37 +00:00
|
|
|
|
|
|
|
|
## Pre-flight metrics (collected $(date -u +%H:%M) UTC)
|
|
|
|
|
${PREFLIGHT_OUTPUT}
|
|
|
|
|
|
|
|
|
|
## Project context
|
2026-04-01 14:25:43 +00:00
|
|
|
${CONTEXT_BLOCK}$(formula_lessons_block)
|
2026-03-21 00:22:37 +00:00
|
|
|
${SCRATCH_CONTEXT:+${SCRATCH_CONTEXT}
|
|
|
|
|
}
|
2026-03-21 00:32:54 +00:00
|
|
|
Priority order: P0 memory > P1 disk > P2 stopped > P3 degraded > P4 housekeeping
|
|
|
|
|
|
2026-03-21 00:22:37 +00:00
|
|
|
${FORMULA_CONTENT}
|
|
|
|
|
|
|
|
|
|
${SCRATCH_INSTRUCTION}
|
|
|
|
|
${PROMPT_FOOTER}"
|
|
|
|
|
|
fix: Migrate planner, predictor, supervisor to SDK (#6)
Replace tmux-based run_formula_and_monitor() with synchronous agent_run()
from lib/agent-sdk.sh, matching the pattern established in gardener-run.sh.
Key changes per agent:
- Drop agent-session.sh, use agent-sdk.sh (SID_FILE, LOGFILE)
- Remove SESSION_NAME, PHASE_FILE, PHASE_POLL_INTERVAL (tmux/phase artifacts)
- Strip phase protocol from prompt footer (SDK mode needs no phase signals)
- Preserve all prompt composition: context blocks, memory, journal, preflight
Shared helpers added to lib/formula-session.sh:
- build_sdk_prompt_footer(): build_prompt_footer minus phase protocol
- formula_worktree_setup(): fetch + cleanup + create worktree + EXIT trap
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-28 13:06:34 +00:00
|
|
|
# ── Run agent ─────────────────────────────────────────────────────────────
|
|
|
|
|
agent_run --worktree "$WORKTREE" "$PROMPT"
|
|
|
|
|
log "agent_run complete"
|
2026-03-21 00:22:37 +00:00
|
|
|
|
2026-04-01 14:16:13 +00:00
|
|
|
# Write journal entry post-session
|
|
|
|
|
profile_write_journal "supervisor-run" "Supervisor run $(date -u +%Y-%m-%d)" "complete" "" || true
|
|
|
|
|
|
fix: Migrate planner, predictor, supervisor to SDK (#6)
Replace tmux-based run_formula_and_monitor() with synchronous agent_run()
from lib/agent-sdk.sh, matching the pattern established in gardener-run.sh.
Key changes per agent:
- Drop agent-session.sh, use agent-sdk.sh (SID_FILE, LOGFILE)
- Remove SESSION_NAME, PHASE_FILE, PHASE_POLL_INTERVAL (tmux/phase artifacts)
- Strip phase protocol from prompt footer (SDK mode needs no phase signals)
- Preserve all prompt composition: context blocks, memory, journal, preflight
Shared helpers added to lib/formula-session.sh:
- build_sdk_prompt_footer(): build_prompt_footer minus phase protocol
- formula_worktree_setup(): fetch + cleanup + create worktree + EXIT trap
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-28 13:06:34 +00:00
|
|
|
rm -f "$SCRATCH_FILE"
|
|
|
|
|
log "--- Supervisor run done ---"
|