Compare commits
1 Commits
fix/515
...
fix/547-ph
| Author | SHA1 | Date | |
|---|---|---|---|
|
eb41220ae4 |
@@ -4,96 +4,58 @@ Phase 1 is the manual-clicker stage of the fleet. The machines exist. The servic
|
||||
|
||||
## Phase Definition
|
||||
|
||||
- **Current state:** Fleet is operational. Three VPS wizards run. Gitea hosts 16 repos. Agents burn through issues nightly.
|
||||
- **The problem:** Everything important still depends on human vigilance. When an agent dies at 2 AM, nobody notices until morning.
|
||||
- **Resources tracked:** Uptime, Capacity Utilization.
|
||||
- **Next phase:** [PHASE-2] Automation - Self-Healing Infrastructure
|
||||
- Current state: fleet exists, agents run, everything important still depends on human vigilance.
|
||||
- Resources tracked here: Capacity, Uptime.
|
||||
- Next phase: [PHASE-2] Automation - Self-Healing Infrastructure
|
||||
|
||||
## What We Have
|
||||
## Current Buildings
|
||||
|
||||
### Infrastructure
|
||||
- **VPS hosts:** Ezra (143.198.27.163), Allegro, Bezalel (167.99.126.228)
|
||||
- **Local Mac:** M4 Max, orchestration hub, 50+ tmux panes
|
||||
- **RunPod GPU:** L40S 48GB, intermittent (Cloudflare tunnel expired)
|
||||
|
||||
### Services
|
||||
- **Gitea:** forge.alexanderwhitestone.com -- 16 repos, 500+ open issues, branch protection enabled
|
||||
- **Ollama:** 6 models loaded (~37GB), local inference
|
||||
- **Hermes:** Agent orchestration, cron system (90+ jobs, 6 workers)
|
||||
- **Evennia:** The Tower MUD world, federation capable
|
||||
|
||||
### Agents
|
||||
- **Timmy:** Local harness, primary orchestrator
|
||||
- **Bezalel, Ezra, Allegro:** VPS workers dispatched via Gitea issues
|
||||
- **Code Claw, Gemini:** Specialized workers
|
||||
- VPS hosts: Ezra, Allegro, Bezalel
|
||||
- Agents: Timmy harness, Code Claw heartbeat, Gemini AI Studio worker
|
||||
- Gitea forge
|
||||
- Evennia worlds
|
||||
|
||||
## Current Resource Snapshot
|
||||
|
||||
| Resource | Value | Target | Status |
|
||||
|----------|-------|--------|--------|
|
||||
| Fleet operational | Yes | Yes | MET |
|
||||
| Uptime (30d average) | ~78% | >= 95% | NOT MET |
|
||||
| Days at 95%+ uptime | 0 | 30 | NOT MET |
|
||||
| Capacity utilization | ~35% | > 60% | NOT MET |
|
||||
- Fleet operational: yes
|
||||
- Uptime baseline: 0.0%
|
||||
- Days at or above 95% uptime: 0
|
||||
- Capacity utilization: 0.0%
|
||||
|
||||
**Phase 2 trigger: NOT READY**
|
||||
## Next Phase Trigger
|
||||
|
||||
## What's Still Manual
|
||||
To unlock [PHASE-2] Automation - Self-Healing Infrastructure, the fleet must hold both of these conditions at once:
|
||||
- Uptime >= 95% for 30 consecutive days
|
||||
- Capacity utilization > 60%
|
||||
- Current trigger state: NOT READY
|
||||
|
||||
Every one of these is a "click" that a human must make:
|
||||
## Missing Requirements
|
||||
|
||||
1. **Restart dead agents** -- SSH into VPS, check process, restart hermes
|
||||
2. **Health checks** -- SSH to each VPS, verify disk/memory/services
|
||||
3. **Dead pane recovery** -- tmux pane dies, nobody notices, work stops
|
||||
4. **Provider failover** -- Nous API goes down, agents stop, human reconfigures
|
||||
5. **PR triage** -- 80% auto-merge, but 20% need human review
|
||||
6. **Backlog management** -- 500+ issues, burn loops help but need supervision
|
||||
7. **Nightly retro** -- manually run and push results
|
||||
8. **Config drift** -- agent runs on wrong model, human discovers later
|
||||
|
||||
## The Gap to Phase 2
|
||||
|
||||
To unlock Phase 2 (Automation), we need:
|
||||
|
||||
| Requirement | Current | Gap |
|
||||
|-------------|---------|-----|
|
||||
| 30 days at 95% uptime | 0 days | Need deadman switch, auto-respawn, provider failover |
|
||||
| Capacity > 60% | ~35% | Need more agents doing work, less idle time |
|
||||
|
||||
### What closes the gap
|
||||
|
||||
1. **Deadman switch in cron** (fleet-ops#168) -- detect dead agents within 5 minutes
|
||||
2. **Auto-respawn** (fleet-ops#173) -- restart dead tmux panes automatically
|
||||
3. **Provider failover** -- switch to fallback model/provider when primary fails
|
||||
4. **Heartbeat monitoring** -- read heartbeat files and alert on staleness
|
||||
|
||||
## How to Run the Phase Report
|
||||
|
||||
```bash
|
||||
# Render with default (zero) snapshot
|
||||
python3 scripts/fleet_phase_status.py
|
||||
|
||||
# Render with real snapshot
|
||||
python3 scripts/fleet_phase_status.py --snapshot configs/phase-1-snapshot.json
|
||||
|
||||
# Output as JSON
|
||||
python3 scripts/fleet_phase_status.py --snapshot configs/phase-1-snapshot.json --json
|
||||
|
||||
# Write to file
|
||||
python3 scripts/fleet_phase_status.py --snapshot configs/phase-1-snapshot.json --output docs/FLEET_PHASE_1_SURVIVAL.md
|
||||
```
|
||||
- Uptime 0.0% / 95.0%
|
||||
- Days at or above 95% uptime: 0/30
|
||||
- Capacity utilization 0.0% / >60.0%
|
||||
|
||||
## Manual Clicker Interpretation
|
||||
|
||||
Paperclips analogy: Phase 1 = Manual clicker. You ARE the automation.
|
||||
Every restart, every SSH, every check is a manual click.
|
||||
|
||||
The goal of Phase 1 is not to automate. It's to **name what needs automating**. Every manual click documented here is a Phase 2 ticket.
|
||||
## Manual Clicks Still Required
|
||||
|
||||
- Restart agents and services by hand when a node goes dark.
|
||||
- SSH into machines to verify health, disk, and memory.
|
||||
- Check Gitea, relay, and world services manually before and after changes.
|
||||
- Act as the scheduler when automation is missing or only partially wired.
|
||||
|
||||
## Repo Signals Already Present
|
||||
|
||||
- `scripts/fleet_health_probe.sh` — Automated health probe exists and can supply the uptime baseline for the next phase.
|
||||
- `scripts/fleet_milestones.py` — Milestone tracker exists, so survival achievements can be narrated and logged.
|
||||
- `scripts/auto_restart_agent.sh` — Auto-restart tooling already exists as phase-2 groundwork.
|
||||
- `scripts/backup_pipeline.sh` — Backup pipeline scaffold exists for post-survival automation work.
|
||||
- `infrastructure/timmy-bridge/reports/generate_report.py` — Bridge reporting exists and can summarize heartbeat-driven uptime.
|
||||
|
||||
## Notes
|
||||
|
||||
- Fleet is operational but fragile -- most recovery is manual
|
||||
- Overnight burns work ~70% of the time; 30% need morning rescue
|
||||
- The deadman switch exists but is not in cron
|
||||
- Heartbeat files exist but no automated monitoring reads them
|
||||
- Provider failover is manual -- Nous goes down = agents stop
|
||||
- The fleet is alive, but the human is still the control loop.
|
||||
- Phase 1 is about naming reality plainly so later automation has a baseline to beat.
|
||||
|
||||
@@ -12,27 +12,6 @@ WORLD_DIR = Path('/Users/apayne/.timmy/evennia/timmy_world')
|
||||
STATE_FILE = WORLD_DIR / 'game_state.json'
|
||||
TIMMY_LOG = WORLD_DIR / 'timmy_log.md'
|
||||
|
||||
FRIENDSHIP_THRESHOLD = 0.5
|
||||
TENSION_THRESHOLD = -0.5
|
||||
NPC_RELATIONSHIP_SEEDS = {
|
||||
("Kimi", "Marcus"): {
|
||||
"values": {"Kimi": 0.45, "Marcus": 0.47},
|
||||
"conversation": "While you are away, Marcus and Kimi trade a quiet confidence beneath the oak.",
|
||||
"milestone": "A friendship starts to take root between Marcus and Kimi.",
|
||||
"hint": "Marcus and Kimi move with the easy familiarity of old friends.",
|
||||
"delta": 0.08,
|
||||
"kind": "friendship",
|
||||
},
|
||||
("Bezalel", "ClawCode"): {
|
||||
"values": {"Bezalel": -0.46, "ClawCode": -0.44},
|
||||
"conversation": "While you are away, Bezalel and ClawCode clash over what the forge is for.",
|
||||
"milestone": "Tension hardens between Bezalel and ClawCode at the anvil.",
|
||||
"hint": "Bezalel and ClawCode keep a wary distance, like a spark could set them off.",
|
||||
"delta": -0.08,
|
||||
"kind": "tension",
|
||||
},
|
||||
}
|
||||
|
||||
# ============================================================
|
||||
# NARRATIVE ARC — 4 phases that transform the world
|
||||
# ============================================================
|
||||
@@ -279,35 +258,7 @@ class World:
|
||||
"items_crafted": 0,
|
||||
"conflicts_resolved": 0,
|
||||
"nights_survived": 0,
|
||||
"npc_friendships": [],
|
||||
"npc_tensions": [],
|
||||
}
|
||||
self._initialize_npc_relationships(apply_seeds=True)
|
||||
|
||||
def _initialize_npc_relationships(self, apply_seeds=False):
|
||||
npc_names = [name for name, char in self.characters.items() if not char.get("is_player", False)]
|
||||
for npc_name in npc_names:
|
||||
trust_map = self.characters[npc_name]["trust"]
|
||||
for other_name in npc_names:
|
||||
if other_name != npc_name:
|
||||
trust_map.setdefault(other_name, 0.0)
|
||||
if apply_seeds:
|
||||
for pair, seed in NPC_RELATIONSHIP_SEEDS.items():
|
||||
left, right = pair
|
||||
self.characters[left]["trust"][right] = seed["values"][left]
|
||||
self.characters[right]["trust"][left] = seed["values"][right]
|
||||
self.state.setdefault("npc_friendships", [])
|
||||
self.state.setdefault("npc_tensions", [])
|
||||
|
||||
def relationship_hint_for_room(self, room_name, occupants):
|
||||
hints = []
|
||||
occupant_set = set(occupants)
|
||||
for bucket in ("npc_friendships", "npc_tensions"):
|
||||
for entry in self.state.get(bucket, []):
|
||||
pair = set(entry.get("pair", []))
|
||||
if entry.get("room") == room_name and pair.issubset(occupant_set):
|
||||
hints.append(entry.get("hint", ""))
|
||||
return [hint for hint in hints if hint]
|
||||
|
||||
def tick_time(self):
|
||||
"""Advance time of day."""
|
||||
@@ -438,8 +389,6 @@ class World:
|
||||
here = [n for n, c in self.characters.items() if c["room"] == room_name and n != char_name]
|
||||
if here:
|
||||
desc += f"\n Here: {', '.join(here)}"
|
||||
for hint in self.relationship_hint_for_room(room_name, here):
|
||||
desc += f" {hint}"
|
||||
|
||||
return desc
|
||||
|
||||
@@ -465,12 +414,6 @@ class World:
|
||||
self.rooms = data.get("rooms", self.rooms)
|
||||
self.characters = data.get("characters", self.characters)
|
||||
self.state = data.get("state", self.state)
|
||||
needs_seed = not any(
|
||||
any(other != "Timmy" for other in char.get("trust", {}))
|
||||
for name, char in self.characters.items()
|
||||
if not char.get("is_player", False)
|
||||
)
|
||||
self._initialize_npc_relationships(apply_seeds=needs_seed)
|
||||
return True
|
||||
return False
|
||||
|
||||
@@ -1129,69 +1072,6 @@ class GameEngine:
|
||||
f.write(f"\n*Began: {datetime.now().strftime('%Y-%m-%d %H:%M')}*\n\n")
|
||||
f.write("---\n\n")
|
||||
f.write(message + "\n")
|
||||
|
||||
def _adjust_mutual_trust(self, left, right, delta):
|
||||
for speaker, listener in ((left, right), (right, left)):
|
||||
trust_map = self.world.characters[speaker]["trust"]
|
||||
trust_map[listener] = max(-1.0, min(1.0, trust_map.get(listener, 0.0) + delta))
|
||||
|
||||
def _record_relationship_milestone(self, scene, room_name, pair, bucket, milestone, hint):
|
||||
pair_list = list(pair)
|
||||
entries = self.world.state.setdefault(bucket, [])
|
||||
if any(entry.get("pair") == pair_list for entry in entries):
|
||||
return
|
||||
entries.append({
|
||||
"pair": pair_list,
|
||||
"room": room_name,
|
||||
"summary": milestone,
|
||||
"hint": hint,
|
||||
})
|
||||
scene["world_events"].append(milestone)
|
||||
|
||||
def _run_offscreen_npc_relationships(self, scene):
|
||||
timmy_room = self.world.characters["Timmy"]["room"]
|
||||
rooms = {}
|
||||
for char_name, char in self.world.characters.items():
|
||||
if char.get("is_player", False):
|
||||
continue
|
||||
rooms.setdefault(char["room"], []).append(char_name)
|
||||
|
||||
for room_name, occupants in rooms.items():
|
||||
if room_name == timmy_room or len(occupants) < 2:
|
||||
continue
|
||||
occupant_set = set(occupants)
|
||||
for pair, seed in NPC_RELATIONSHIP_SEEDS.items():
|
||||
if not set(pair).issubset(occupant_set):
|
||||
continue
|
||||
left, right = pair
|
||||
self._adjust_mutual_trust(left, right, seed["delta"])
|
||||
scene["npc_actions"].append(f"{left} and {right} speak in The {room_name} while you are away.")
|
||||
scene["world_events"].append(seed["conversation"])
|
||||
self.world.characters[left]["spoken"].append(seed["conversation"])
|
||||
self.world.characters[right]["spoken"].append(seed["conversation"])
|
||||
self.world.characters[left]["memories"].append(seed["conversation"])
|
||||
self.world.characters[right]["memories"].append(seed["conversation"])
|
||||
|
||||
left_trust = self.world.characters[left]["trust"][right]
|
||||
right_trust = self.world.characters[right]["trust"][left]
|
||||
if seed["kind"] == "friendship" and left_trust >= FRIENDSHIP_THRESHOLD and right_trust >= FRIENDSHIP_THRESHOLD:
|
||||
self._record_relationship_milestone(
|
||||
scene,
|
||||
room_name,
|
||||
pair,
|
||||
"npc_friendships",
|
||||
seed["milestone"],
|
||||
seed["hint"],
|
||||
)
|
||||
elif seed["kind"] == "tension" and left_trust <= TENSION_THRESHOLD and right_trust <= TENSION_THRESHOLD:
|
||||
self._record_relationship_milestone(
|
||||
scene,
|
||||
room_name,
|
||||
pair,
|
||||
"npc_tensions",
|
||||
seed["milestone"],
|
||||
seed["hint"],
|
||||
)
|
||||
|
||||
def run_tick(self, timmy_action="look"):
|
||||
"""Run one tick. Return the scene and available choices."""
|
||||
@@ -1517,8 +1397,6 @@ class GameEngine:
|
||||
self.world.characters[char_name]["room"] = dest
|
||||
self.world.characters[char_name]["energy"] -= 1
|
||||
scene["npc_actions"].append(f"{char_name} moves from The {old_room} to The {dest}")
|
||||
|
||||
self._run_offscreen_npc_relationships(scene)
|
||||
|
||||
# Random NPC events — phase-aware speech
|
||||
room_name = self.world.characters["Timmy"]["room"]
|
||||
|
||||
@@ -10,6 +10,7 @@ BACKUP_LOG_DIR="${BACKUP_LOG_DIR:-${BACKUP_ROOT}/logs}"
|
||||
BACKUP_RETENTION_DAYS="${BACKUP_RETENTION_DAYS:-14}"
|
||||
BACKUP_S3_URI="${BACKUP_S3_URI:-}"
|
||||
BACKUP_NAS_TARGET="${BACKUP_NAS_TARGET:-}"
|
||||
OFFSITE_TARGET="${OFFSITE_TARGET:-}"
|
||||
AWS_ENDPOINT_URL="${AWS_ENDPOINT_URL:-}"
|
||||
BACKUP_NAME="hermes-backup-${DATESTAMP}"
|
||||
LOCAL_BACKUP_DIR="${BACKUP_ROOT}/${DATESTAMP}"
|
||||
@@ -31,6 +32,16 @@ fail() {
|
||||
exit 1
|
||||
}
|
||||
|
||||
send_telegram() {
|
||||
local message="$1"
|
||||
if [[ -n "${TELEGRAM_BOT_TOKEN:-}" && -n "${TELEGRAM_CHAT_ID:-}" ]]; then
|
||||
curl -s -X POST "https://api.telegram.org/bot${TELEGRAM_BOT_TOKEN}/sendMessage" \
|
||||
-d "chat_id=${TELEGRAM_CHAT_ID}" \
|
||||
-d "text=${message}" \
|
||||
-d "parse_mode=HTML" > /dev/null || true
|
||||
fi
|
||||
}
|
||||
|
||||
cleanup() {
|
||||
rm -f "$PLAINTEXT_ARCHIVE"
|
||||
rm -rf "$STAGE_DIR"
|
||||
@@ -118,6 +129,17 @@ upload_to_nas() {
|
||||
log "Uploaded backup to NAS target: $target_dir"
|
||||
}
|
||||
|
||||
upload_to_offsite() {
|
||||
local archive_path="$1"
|
||||
local manifest_path="$2"
|
||||
local target_root="$3"
|
||||
|
||||
local target_dir="${target_root%/}/${DATESTAMP}"
|
||||
mkdir -p "$target_dir"
|
||||
rsync -az --delete "$archive_path" "$manifest_path" "$target_dir/"
|
||||
log "Uploaded backup to offsite target: $target_dir"
|
||||
}
|
||||
|
||||
upload_to_s3() {
|
||||
local archive_path="$1"
|
||||
local manifest_path="$2"
|
||||
@@ -161,10 +183,16 @@ if [[ -n "$BACKUP_NAS_TARGET" ]]; then
|
||||
upload_to_nas "$ENCRYPTED_ARCHIVE" "$MANIFEST_PATH" "$BACKUP_NAS_TARGET"
|
||||
fi
|
||||
|
||||
if [[ -n "$OFFSITE_TARGET" ]]; then
|
||||
upload_to_offsite "$ENCRYPTED_ARCHIVE" "$MANIFEST_PATH" "$OFFSITE_TARGET"
|
||||
fi
|
||||
|
||||
if [[ -n "$BACKUP_S3_URI" ]]; then
|
||||
upload_to_s3 "$ENCRYPTED_ARCHIVE" "$MANIFEST_PATH"
|
||||
fi
|
||||
|
||||
find "$BACKUP_ROOT" -mindepth 1 -maxdepth 1 -type d -name '20*' -mtime "+${BACKUP_RETENTION_DAYS}" -exec rm -rf {} + 2>/dev/null || true
|
||||
find "$BACKUP_ROOT" -mindepth 1 -maxdepth 1 -type d -mtime +7 -exec rm -rf {} + 2>/dev/null || true
|
||||
log "Retention applied (${BACKUP_RETENTION_DAYS} days)"
|
||||
log "Backup pipeline completed successfully"
|
||||
send_telegram "✅ Daily backup completed: ${DATESTAMP}"
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
from importlib.util import module_from_spec, spec_from_file_location
|
||||
from pathlib import Path
|
||||
import unittest
|
||||
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
GAME_PATH = ROOT / "evennia" / "timmy_world" / "game.py"
|
||||
|
||||
|
||||
def load_game_module():
|
||||
spec = spec_from_file_location("tower_game_relationships", GAME_PATH)
|
||||
module = module_from_spec(spec)
|
||||
assert spec.loader is not None
|
||||
spec.loader.exec_module(module)
|
||||
module.random.seed(0)
|
||||
return module
|
||||
|
||||
|
||||
class TestTowerGameNpcRelationships(unittest.TestCase):
|
||||
def test_each_npc_tracks_trust_for_every_other_npc(self):
|
||||
module = load_game_module()
|
||||
world = module.World()
|
||||
npc_names = [name for name, char in world.characters.items() if not char.get("is_player", False)]
|
||||
|
||||
for npc_name in npc_names:
|
||||
with self.subTest(npc=npc_name):
|
||||
trust_map = world.characters[npc_name]["trust"]
|
||||
expected = set(npc_names) - {npc_name}
|
||||
self.assertTrue(expected.issubset(set(trust_map)), f"{npc_name} missing NPC trust keys: {sorted(expected - set(trust_map))}")
|
||||
|
||||
def test_offscreen_npc_conversations_create_friendship_and_tension(self):
|
||||
module = load_game_module()
|
||||
engine = module.GameEngine()
|
||||
engine.start_new_game()
|
||||
|
||||
result = engine.run_tick("look")
|
||||
|
||||
friendships = {tuple(rel["pair"]) for rel in engine.world.state["npc_friendships"]}
|
||||
tensions = {tuple(rel["pair"]) for rel in engine.world.state["npc_tensions"]}
|
||||
|
||||
self.assertIn(("Kimi", "Marcus"), friendships)
|
||||
self.assertIn(("Bezalel", "ClawCode"), tensions)
|
||||
self.assertTrue(any("while you are away" in line.lower() for line in result["world_events"]))
|
||||
|
||||
garden_desc = engine.world.get_room_desc("Garden", "Timmy")
|
||||
forge_desc = engine.world.get_room_desc("Forge", "Timmy")
|
||||
self.assertIn("Marcus and Kimi", garden_desc)
|
||||
self.assertIn("Bezalel and ClawCode", forge_desc)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Reference in New Issue
Block a user