fix: give tower NPC room movement purposeful goals (#517)

docs/BEZALEL_TAILSCALE_BOOTSTRAP.md

@@ -1,96 +0,0 @@
-# Bezalel Tailscale Bootstrap
-
-Refs #535
-
-This is the repo-side operator packet for installing Tailscale on the Bezalel VPS and verifying the internal network path for federation work.
-
-Important truth:
-- issue #535 names `104.131.15.18`
-- older Bezalel control-plane docs also mention `159.203.146.185`
-- the current source of truth in this repo is `ansible/inventory/hosts.ini`, which currently resolves `bezalel` to `67.205.155.108`
-
-Because of that drift, `scripts/bezalel_tailscale_bootstrap.py` now resolves the target host from `ansible/inventory/hosts.ini` by default instead of trusting a stale hardcoded IP.
-
-## What the script does
-
-`python3 scripts/bezalel_tailscale_bootstrap.py`
-
-Safe by default:
-- builds the remote bootstrap script
-- writes it locally to `/tmp/bezalel_tailscale_bootstrap.sh`
-- prints the SSH command needed to run it
-- does **not** touch the VPS unless `--apply` is passed
-
-When applied, the remote script does all of the issue’s repo-side bootstrap steps:
-- installs Tailscale
-- runs `tailscale up --ssh --hostname bezalel`
-- appends the provided Mac SSH public key to `~/.ssh/authorized_keys`
-- prints `tailscale status --json`
-- pings the expected peer targets:
-  - Mac: `100.124.176.28`
-  - Ezra: `100.126.61.75`
-
-## Required secrets / inputs
-
-- Tailscale auth key
-- Mac SSH public key
-
-Provide them either directly or through files:
-- `--auth-key` or `--auth-key-file`
-- `--ssh-public-key` or `--ssh-public-key-file`
-
-## Dry-run example
-
-```bash
-python3 scripts/bezalel_tailscale_bootstrap.py \
-  --auth-key-file ~/.config/tailscale/auth_key \
-  --ssh-public-key-file ~/.ssh/id_ed25519.pub \
-  --json
-```
-
-This prints:
-- resolved host
-- host source (`inventory:<path>` when pulled from `ansible/inventory/hosts.ini`)
-- local script path
-- SSH command to execute
-- peer targets
-
-## Apply example
-
-```bash
-python3 scripts/bezalel_tailscale_bootstrap.py \
-  --auth-key-file ~/.config/tailscale/auth_key \
-  --ssh-public-key-file ~/.ssh/id_ed25519.pub \
-  --apply \
-  --json
-```
-
-## Verifying success after apply
-
-The script now parses the remote stdout into structured verification data:
-- `verification.tailscale.self.tailscale_ips`
-- `verification.tailscale.self.dns_name`
-- `verification.peers`
-- `verification.ping_ok`
-
-A successful run should show:
-- at least one Bezalel Tailscale IP under `tailscale_ips`
-- `ping_ok.mac = 100.124.176.28`
-- `ping_ok.ezra = 100.126.61.75`
-
-## Expected remote install commands
-
-```bash
-curl -fsSL https://tailscale.com/install.sh | sh
-tailscale up --ssh --hostname bezalel
-install -d -m 700 ~/.ssh
-touch ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys
-tailscale status --json
-```
-
-## Why this PR does not claim live completion
-
-This repo can safely ship the bootstrap script, host resolution logic, structured proof parsing, and operator packet.
-It cannot honestly claim that Bezalel was actually joined to the tailnet unless a human/operator runs the script with a real auth key and real SSH access to the VPS.
-
-That means the correct PR language for #535 is advancement, not pretend closure.

docs/RUNBOOK_INDEX.md

@@ -14,7 +14,6 @@ Quick-reference index for common operational tasks across the Timmy Foundation i
 | Agent scorecard | fleet-ops | `python3 scripts/agent_scorecard.py` |
 | View fleet manifest | fleet-ops | `cat manifest.yaml` |
 | Run nightly codebase genome pass | timmy-home | `python3 scripts/codebase_genome_nightly.py --dry-run` |
-| Prepare Bezalel Tailscale bootstrap | timmy-home | `python3 scripts/bezalel_tailscale_bootstrap.py --auth-key-file <path> --ssh-public-key-file <path> --json` |
 
 ## the-nexus (Frontend + Brain)
 

evennia/timmy_world/world/game.py

@@ -454,23 +454,112 @@ class TimmyAI:
 
 class NPCAI:
     """AI for non-player characters. They make choices based on goals."""
-    
+
+    GOAL_ROOM_TARGETS = {
+        "Marcus": {
+            "sit": "Garden",
+            "speak_truth": "Threshold",
+            "remember": "Bridge",
+        },
+        "Bezalel": {
+            "forge": "Forge",
+            "tend_fire": "Forge",
+            "create_key": "Forge",
+        },
+        "Allegro": {
+            "oversee": "Threshold",
+            "keep_time": "Tower",
+            "check_tunnel": "Bridge",
+        },
+        "Ezra": {
+            "study": "Tower",
+            "read_whiteboard": "Tower",
+            "find_pattern": "Tower",
+        },
+        "Gemini": {
+            "observe": "Threshold",
+            "tend_garden": "Garden",
+            "listen": "Garden",
+        },
+        "Claude": {
+            "inspect": "Threshold",
+            "organize": "Tower",
+            "enforce_order": "Bridge",
+        },
+        "ClawCode": {
+            "forge": "Forge",
+            "test_edge": "Bridge",
+            "build_weapon": "Forge",
+        },
+        "Kimi": {
+            "contemplate": "Garden",
+            "read": "Tower",
+            "remember": "Bridge",
+        },
+    }
+
+    GOAL_CYCLES = {
+        "Marcus": ("sit", "speak_truth", "remember"),
+        "Allegro": ("oversee", "keep_time", "check_tunnel"),
+        "Claude": ("inspect", "organize", "enforce_order"),
+        "ClawCode": ("test_edge", "forge", "build_weapon"),
+        "Kimi": ("contemplate", "read", "remember"),
+    }
+
     def __init__(self, world):
         self.world = world
-    
+
+    def _available_targets(self, available, prefix):
+        return [a.split(":", 1)[1] for a in available if a.startswith(f"{prefix}:")]
+
+    def _target_room_for(self, char_name, goal):
+        return self.GOAL_ROOM_TARGETS.get(char_name, {}).get(goal)
+
+    def _next_direction_toward(self, current_room, target_room):
+        if current_room == target_room:
+            return None
+        frontier = [(current_room, [])]
+        seen = {current_room}
+        while frontier:
+            room, path = frontier.pop(0)
+            if room == target_room:
+                return path[0] if path else None
+            for direction, dest in self.world.rooms[room].get("connections", {}).items():
+                if dest not in seen:
+                    seen.add(dest)
+                    frontier.append((dest, path + [direction]))
+        return None
+
+    def _move_toward_goal(self, room, target_room):
+        direction = self._next_direction_toward(room, target_room)
+        return f"move:{direction}" if direction else None
+
+    def _advance_goal_cycle(self, char_name, char):
+        cycle = self.GOAL_CYCLES.get(char_name)
+        if not cycle or self.world.tick <= 0:
+            return
+        goal = char.get("active_goal")
+        if goal not in cycle:
+            return
+        target_room = self._target_room_for(char_name, goal)
+        if char.get("room") != target_room:
+            return
+        if self.world.tick % 12 != 0:
+            return
+        index = cycle.index(goal)
+        char["active_goal"] = cycle[(index + 1) % len(cycle)]
+
     def make_choice(self, char_name):
         """Make a choice for this NPC this tick."""
         char = self.world.characters[char_name]
+        self._advance_goal_cycle(char_name, char)
         room = char["room"]
         available = ActionSystem.get_available_actions(char_name, self.world)
-        
+
         # If low energy, rest
         if char["energy"] <= 1:
             return "rest"
-        
-        # Goal-driven behavior
-        goal = char["active_goal"]
-        
+
         if char_name == "Marcus":
             return self._marcus_choice(char, room, available)
         elif char_name == "Bezalel":
@@ -487,66 +576,96 @@ class NPCAI:
             return self._clawcode_choice(char, room, available)
         elif char_name == "Kimi":
             return self._kimi_choice(char, room, available)
-        
+
         return "rest"
-    
+
     def _marcus_choice(self, char, room, available):
+        goal = char.get("active_goal", "sit")
+        target_room = self._target_room_for("Marcus", goal)
+        if room != target_room:
+            return self._move_toward_goal(room, target_room) or "rest"
+        others = self._available_targets(available, "speak")
+        if goal == "speak_truth" and others:
+            return f"speak:{random.choice(others)}"
+        if goal == "remember" and room == "Bridge":
+            return random.choice(["examine", "rest"])
         if room == "Garden" and random.random() < 0.7:
             return "rest"
-        if room != "Garden":
-            return "move:west"
-        # Speak to someone if possible
-        others = [a.split(":")[1] for a in available if a.startswith("speak:")]
         if others and random.random() < 0.4:
             return f"speak:{random.choice(others)}"
         return "rest"
-    
+
     def _bezalel_choice(self, char, room, available):
+        target_room = self._target_room_for("Bezalel", char.get("active_goal", "forge"))
+        if room != target_room:
+            return self._move_toward_goal(room, target_room) or "rest"
         if room == "Forge" and self.world.rooms["Forge"]["fire"] == "glowing":
             return random.choice(["forge", "rest"] if char["energy"] > 2 else ["rest"])
-        if room != "Forge":
-            return "move:west"
         if random.random() < 0.3:
             return "tend_fire"
         return "forge"
-    
+
     def _kimi_choice(self, char, room, available):
-        others = [a.split(":")[1] for a in available if a.startswith("speak:")]
+        goal = char.get("active_goal", "contemplate")
+        target_room = self._target_room_for("Kimi", goal)
+        if room != target_room:
+            return self._move_toward_goal(room, target_room) or "rest"
+        others = self._available_targets(available, "speak")
+        if goal == "read" and room == "Tower":
+            return "study" if char["energy"] > 2 else "rest"
         if room == "Garden" and others and random.random() < 0.3:
             return f"speak:{random.choice(others)}"
-        if room == "Tower":
-            return "study" if char["energy"] > 2 else "rest"
-        return "move:east"  # Head back toward Garden
-    
+        if room == "Bridge":
+            return random.choice(["examine", "rest"])
+        return "rest"
+
     def _gemini_choice(self, char, room, available):
-        others = [a.split(":")[1] for a in available if a.startswith("listen:")]
-        if room == "Garden" and others and random.random() < 0.4:
-            return f"listen:{random.choice(others)}"
-        return random.choice(["plant", "rest"] if room == "Garden" else ["move:west"])
-    
+        goal = char.get("active_goal", "observe")
+        target_room = self._target_room_for("Gemini", goal)
+        if room != target_room:
+            return self._move_toward_goal(room, target_room) or "rest"
+        listeners = self._available_targets(available, "listen")
+        if room == "Garden" and listeners and random.random() < 0.4:
+            return f"listen:{random.choice(listeners)}"
+        return random.choice(["plant", "rest"] if room == "Garden" else ["examine", "rest"])
+
     def _ezra_choice(self, char, room, available):
+        goal = char.get("active_goal", "study")
+        target_room = self._target_room_for("Ezra", goal)
+        if room != target_room:
+            return self._move_toward_goal(room, target_room) or "rest"
         if room == "Tower" and char["energy"] > 2:
             return random.choice(["study", "write_rule", "help:Timmy"])
-        if room != "Tower":
-            return "move:south"
         return "rest"
-    
+
     def _claude_choice(self, char, room, available):
-        others = [a.split(":")[1] for a in available if a.startswith("confront:")]
+        goal = char.get("active_goal", "inspect")
+        target_room = self._target_room_for("Claude", goal)
+        if room != target_room:
+            return self._move_toward_goal(room, target_room) or "rest"
+        others = self._available_targets(available, "confront")
         if others and random.random() < 0.2:
             return f"confront:{random.choice(others)}"
         return random.choice(["examine", "rest"])
-    
+
     def _clawcode_choice(self, char, room, available):
+        goal = char.get("active_goal", "test_edge")
+        target_room = self._target_room_for("ClawCode", goal)
+        if room != target_room:
+            return self._move_toward_goal(room, target_room) or "rest"
         if room == "Forge" and char["energy"] > 2:
             return "forge"
-        return random.choice(["move:east", "forge", "rest"])
-    
+        return random.choice(["examine", "rest"])
+
     def _allegro_choice(self, char, room, available):
-        others = [a.split(":")[1] for a in available if a.startswith("speak:")]
+        goal = char.get("active_goal", "oversee")
+        target_room = self._target_room_for("Allegro", goal)
+        if room != target_room:
+            return self._move_toward_goal(room, target_room) or "rest"
+        others = self._available_targets(available, "speak")
         if others and random.random() < 0.3:
             return f"speak:{random.choice(others)}"
-        return random.choice(["move:north", "move:south", "examine"])
+        return random.choice(["examine", "rest"])
 
 
 class DialogueSystem:

scripts/bezalel_tailscale_bootstrap.py

@@ -16,14 +16,11 @@ import argparse
 import json
 import shlex
 import subprocess
-import re
-from json import JSONDecoder
 from pathlib import Path
 from typing import Any
 
-DEFAULT_HOST = "67.205.155.108"
+DEFAULT_HOST = "159.203.146.185"
 DEFAULT_HOSTNAME = "bezalel"
-DEFAULT_INVENTORY_PATH = Path(__file__).resolve().parents[1] / "ansible" / "inventory" / "hosts.ini"
 DEFAULT_PEERS = {
     "mac": "100.124.176.28",
     "ezra": "100.126.61.75",
@@ -69,37 +66,6 @@ def parse_tailscale_status(payload: dict[str, Any]) -> dict[str, Any]:
     }
 
 
-def resolve_host(host: str | None, inventory_path: Path = DEFAULT_INVENTORY_PATH, hostname: str = DEFAULT_HOSTNAME) -> tuple[str, str]:
-    if host:
-        return host, "explicit"
-    if inventory_path.exists():
-        pattern = re.compile(rf"^{re.escape(hostname)}\s+.*ansible_host=([^\s]+)")
-        for line in inventory_path.read_text().splitlines():
-            match = pattern.search(line.strip())
-            if match:
-                return match.group(1), f"inventory:{inventory_path}"
-    return DEFAULT_HOST, "default"
-
-
-def parse_apply_output(stdout: str) -> dict[str, Any]:
-    result: dict[str, Any] = {"tailscale": None, "ping_ok": {}}
-    text = stdout or ""
-    start = text.find("{")
-    if start != -1:
-        try:
-            payload, _ = JSONDecoder().raw_decode(text[start:])
-            if isinstance(payload, dict):
-                result["tailscale"] = parse_tailscale_status(payload)
-        except Exception:
-            pass
-
-    for line in text.splitlines():
-        if line.startswith("PING_OK:"):
-            _, name, ip = line.split(":", 2)
-            result["ping_ok"][name] = ip
-    return result
-
-
 def build_ssh_command(host: str, remote_script_path: str = "/tmp/bezalel_tailscale_bootstrap.sh") -> list[str]:
     return ["ssh", host, f"bash {shlex.quote(remote_script_path)}"]
 
@@ -123,9 +89,8 @@ def parse_peer_args(items: list[str]) -> dict[str, str]:
 
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(description="Prepare or execute Tailscale bootstrap for the Bezalel VPS.")
-    parser.add_argument("--host")
+    parser.add_argument("--host", default=DEFAULT_HOST)
     parser.add_argument("--hostname", default=DEFAULT_HOSTNAME)
-    parser.add_argument("--inventory-path", type=Path, default=DEFAULT_INVENTORY_PATH)
     parser.add_argument("--auth-key", help="Tailscale auth key")
     parser.add_argument("--auth-key-file", type=Path, help="Path to file containing the Tailscale auth key")
     parser.add_argument("--ssh-public-key", help="SSH public key to append to authorized_keys")
@@ -151,7 +116,6 @@ def main() -> None:
     auth_key = _read_secret(args.auth_key, args.auth_key_file)
     ssh_public_key = _read_secret(args.ssh_public_key, args.ssh_public_key_file)
     peers = parse_peer_args(args.peer)
-    resolved_host, host_source = resolve_host(args.host, args.inventory_path, args.hostname)
 
     if not auth_key:
         raise SystemExit("Missing Tailscale auth key. Use --auth-key or --auth-key-file.")
@@ -162,31 +126,28 @@ def main() -> None:
     write_script(args.script_out, script)
 
     payload: dict[str, Any] = {
-        "host": resolved_host,
-        "host_source": host_source,
+        "host": args.host,
         "hostname": args.hostname,
-        "inventory_path": str(args.inventory_path),
         "script_out": str(args.script_out),
         "remote_script_path": args.remote_script_path,
-        "ssh_command": build_ssh_command(resolved_host, args.remote_script_path),
+        "ssh_command": build_ssh_command(args.host, args.remote_script_path),
         "peer_targets": peers,
         "applied": False,
     }
 
     if args.apply:
-        result = run_remote(resolved_host, args.remote_script_path)
+        result = run_remote(args.host, args.remote_script_path)
         payload["applied"] = True
         payload["exit_code"] = result.returncode
         payload["stdout"] = result.stdout
         payload["stderr"] = result.stderr
-        payload["verification"] = parse_apply_output(result.stdout)
 
     if args.json:
         print(json.dumps(payload, indent=2))
         return
 
     print("--- Bezalel Tailscale Bootstrap ---")
-    print(f"Host: {resolved_host} ({host_source})")
+    print(f"Host: {args.host}")
     print(f"Local script: {args.script_out}")
     print("SSH command: " + " ".join(payload["ssh_command"]))
     if args.apply:

tests/test_bezalel_tailscale_bootstrap.py

@@ -2,12 +2,9 @@ from scripts.bezalel_tailscale_bootstrap import (
     DEFAULT_PEERS,
     build_remote_script,
     build_ssh_command,
-    parse_apply_output,
     parse_peer_args,
     parse_tailscale_status,
-    resolve_host,
 )
-from pathlib import Path
 
 
 def test_build_remote_script_contains_install_up_and_key_append():
@@ -81,46 +78,3 @@ def test_parse_peer_args_merges_overrides_into_defaults():
         "ezra": "100.126.61.76",
         "forge": "100.70.0.9",
     }
-
-
-def test_resolve_host_prefers_inventory_over_stale_default(tmp_path: Path):
-    inventory = tmp_path / "hosts.ini"
-    inventory.write_text(
-        "[fleet]\n"
-        "ezra ansible_host=143.198.27.163 ansible_user=root\n"
-        "bezalel ansible_host=67.205.155.108 ansible_user=root\n"
-    )
-
-    host, source = resolve_host(None, inventory)
-
-    assert host == "67.205.155.108"
-    assert source == f"inventory:{inventory}"
-
-
-def test_parse_apply_output_extracts_status_and_ping_markers():
-    stdout = (
-        '{"Self": {"HostName": "bezalel", "DNSName": "bezalel.tailnet.ts.net", "TailscaleIPs": ["100.90.0.10"]}, '
-        '"Peer": {"node-1": {"HostName": "ezra", "TailscaleIPs": ["100.126.61.75"]}}}'
-        "\nPING_OK:mac:100.124.176.28\n"
-        "PING_OK:ezra:100.126.61.75\n"
-    )
-
-    result = parse_apply_output(stdout)
-
-    assert result["tailscale"]["self"]["tailscale_ips"] == ["100.90.0.10"]
-    assert result["ping_ok"] == {"mac": "100.124.176.28", "ezra": "100.126.61.75"}
-
-
-def test_runbook_doc_exists_and_mentions_inventory_auth_and_peer_checks():
-    doc = Path("docs/BEZALEL_TAILSCALE_BOOTSTRAP.md")
-    assert doc.exists(), "missing docs/BEZALEL_TAILSCALE_BOOTSTRAP.md"
-    text = doc.read_text()
-    assert "ansible/inventory/hosts.ini" in text
-    assert "tailscale up" in text
-    assert "authorized_keys" in text
-    assert "100.124.176.28" in text
-    assert "100.126.61.75" in text
-
-    runbook = Path("docs/RUNBOOK_INDEX.md").read_text()
-    assert "Prepare Bezalel Tailscale bootstrap" in runbook
-    assert "scripts/bezalel_tailscale_bootstrap.py" in runbook

tests/test_tower_game_npc_purpose.py

@@ -0,0 +1,54 @@
+from importlib.util import module_from_spec, spec_from_file_location
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parent.parent
+GAME_PATH = ROOT / "evennia" / "timmy_world" / "world" / "game.py"
+
+
+def load_game_module():
+    spec = spec_from_file_location("tower_world_game", GAME_PATH)
+    module = module_from_spec(spec)
+    assert spec.loader is not None
+    spec.loader.exec_module(module)
+    module.random.seed(0)
+    return module
+
+
+def _visitor_sets_after_ticks(module, ticks=100):
+    engine = module.GameEngine()
+    engine.start_new_game()
+    visitors = {room: set() for room in engine.world.rooms}
+    for _ in range(ticks):
+        engine.run_tick("rest")
+        for name, char in engine.world.characters.items():
+            if name == "Timmy":
+                continue
+            visitors[char["room"]].add(name)
+    return visitors
+
+
+class TestTowerGameNpcPurpose:
+    def test_goal_driven_room_targets(self):
+        module = load_game_module()
+        world = module.World()
+        npc_ai = module.NPCAI(world)
+
+        world.characters["Marcus"]["room"] = "Threshold"
+        world.characters["Marcus"]["active_goal"] = "sit"
+        assert npc_ai.make_choice("Marcus") == "move:east"
+
+        world.characters["Ezra"]["room"] = "Threshold"
+        world.characters["Ezra"]["active_goal"] = "study"
+        assert npc_ai.make_choice("Ezra") == "move:north"
+
+        world.characters["Claude"]["room"] = "Threshold"
+        world.characters["Claude"]["active_goal"] = "enforce_order"
+        assert npc_ai.make_choice("Claude") == "move:south"
+
+    def test_every_room_gets_multiple_npc_visitors_over_100_ticks(self):
+        module = load_game_module()
+        visitors = _visitor_sets_after_ticks(module, ticks=100)
+
+        assert all(len(names) >= 2 for names in visitors.values()), visitors
+        assert len(visitors["Bridge"]) >= 3, visitors["Bridge"]