de2e7dc1fb
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>
109 lines
4.7 KiB
Bash
Executable file
109 lines
4.7 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
# =============================================================================
|
|
# supervisor-run.sh — Cron wrapper: supervisor execution via SDK + formula
|
|
#
|
|
# Synchronous bash loop using claude -p (one-shot invocation).
|
|
# No tmux sessions, no phase files — the bash script IS the state machine.
|
|
#
|
|
# 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
|
|
#
|
|
# 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"
|
|
# Use supervisor-bot's own Forgejo identity (#747)
|
|
FORGE_TOKEN="${FORGE_SUPERVISOR_TOKEN:-${FORGE_TOKEN}}"
|
|
# shellcheck source=../lib/formula-session.sh
|
|
source "$FACTORY_ROOT/lib/formula-session.sh"
|
|
# shellcheck source=../lib/worktree.sh
|
|
source "$FACTORY_ROOT/lib/worktree.sh"
|
|
# shellcheck source=../lib/guard.sh
|
|
source "$FACTORY_ROOT/lib/guard.sh"
|
|
# shellcheck source=../lib/agent-sdk.sh
|
|
source "$FACTORY_ROOT/lib/agent-sdk.sh"
|
|
|
|
LOG_FILE="$SCRIPT_DIR/supervisor.log"
|
|
# 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"
|
|
SCRATCH_FILE="/tmp/supervisor-${PROJECT_NAME}-scratch.md"
|
|
WORKTREE="/tmp/${PROJECT_NAME}-supervisor-run"
|
|
|
|
log() { echo "[$(date -u +%Y-%m-%dT%H:%M:%S)Z] $*" >> "$LOG_FILE"; }
|
|
|
|
# ── Guards ────────────────────────────────────────────────────────────────
|
|
check_active supervisor
|
|
acquire_cron_lock "/tmp/supervisor-run.lock"
|
|
check_memory 2000
|
|
|
|
log "--- Supervisor run start ---"
|
|
|
|
# ── Housekeeping: clean up stale crashed worktrees (>24h) ────────────────
|
|
cleanup_stale_crashed_worktrees 24
|
|
|
|
# ── 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 ───────────────────────────────────────────────
|
|
load_formula "$FACTORY_ROOT/formulas/run-supervisor.toml"
|
|
build_context_block AGENTS.md
|
|
|
|
# ── Read scratch file (compaction survival) ───────────────────────────────
|
|
SCRATCH_CONTEXT=$(read_scratch_context "$SCRATCH_FILE")
|
|
SCRATCH_INSTRUCTION=$(build_scratch_instruction "$SCRATCH_FILE")
|
|
|
|
# ── Build prompt ─────────────────────────────────────────────────────────
|
|
build_sdk_prompt_footer
|
|
export CLAUDE_MODEL="sonnet"
|
|
|
|
# ── 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.
|
|
|
|
You have full shell access and --dangerously-skip-permissions.
|
|
Fix what you can. File vault items for what you cannot. Do NOT ask permission — act first, report after.
|
|
|
|
## Pre-flight metrics (collected $(date -u +%H:%M) UTC)
|
|
${PREFLIGHT_OUTPUT}
|
|
|
|
## Project context
|
|
${CONTEXT_BLOCK}
|
|
${SCRATCH_CONTEXT:+${SCRATCH_CONTEXT}
|
|
}
|
|
Priority order: P0 memory > P1 disk > P2 stopped > P3 degraded > P4 housekeeping
|
|
|
|
${FORMULA_CONTENT}
|
|
|
|
${SCRATCH_INSTRUCTION}
|
|
${PROMPT_FOOTER}"
|
|
|
|
# ── Run agent ─────────────────────────────────────────────────────────────
|
|
agent_run --worktree "$WORKTREE" "$PROMPT"
|
|
log "agent_run complete"
|
|
|
|
rm -f "$SCRATCH_FILE"
|
|
log "--- Supervisor run done ---"
|