feat: add tower world-changing items for #514

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/game.py

@@ -12,6 +12,29 @@ WORLD_DIR = Path('/Users/apayne/.timmy/evennia/timmy_world')
 STATE_FILE = WORLD_DIR / 'game_state.json'
 TIMMY_LOG = WORLD_DIR / 'timmy_log.md'
 
+WORLD_ITEMS = {
+    "foraged key": {"effect": "unlock_tower_cache", "quest_item": True, "consumable": False, "effect_text": "A hidden cache clicks open in the Tower wall."},
+    "seed packet": {"effect": "grow_garden", "quest_item": False, "consumable": True, "effect_text": "Fresh growth pushes through the Garden soil."},
+    "notebook": {"effect": "write_notebook_rule", "quest_item": False, "consumable": False, "effect_text": "A new rule joins the whiteboard in the Tower."},
+    "cloth": {"effect": "patch_bridge", "quest_item": False, "consumable": True, "effect_text": "The Bridge railing is wrapped tight against the weather."},
+    "oil can": {"effect": "stoke_forge", "quest_item": False, "consumable": True, "effect_text": "The Forge fire answers with a hotter glow."},
+    "lantern": {"effect": "light_bridge", "quest_item": False, "consumable": False, "effect_text": "A steady lantern glow cuts through the dark over the Bridge."},
+    "rope spool": {"effect": "secure_bridge", "quest_item": False, "consumable": True, "effect_text": "The Bridge is lashed tight and feels safer underfoot."},
+    "chalk": {"effect": "mark_threshold", "quest_item": False, "consumable": True, "effect_text": "A chalk mark at the Threshold points wanderers home."},
+    "weather vane": {"effect": "read_weather", "quest_item": False, "consumable": False, "effect_text": "The weather vane settles and the coming storm makes sense."},
+    "sunstone": {"effect": "restore_tower_power", "quest_item": False, "consumable": False, "effect_text": "Warm light races through the Tower circuits."},
+    "iron nails": {"effect": "reinforce_bridge", "quest_item": False, "consumable": True, "effect_text": "The Bridge planks are pinned down against the flood."},
+    "river stone": {"effect": "water_garden", "quest_item": False, "consumable": True, "effect_text": "Moisture returns to the Garden beds."},
+}
+
+ROOM_DISCOVERABLES = {
+    "Threshold": ["chalk", "sunstone"],
+    "Tower": ["notebook", "lantern"],
+    "Forge": ["oil can", "iron nails"],
+    "Garden": ["seed packet", "foraged key"],
+    "Bridge": ["cloth", "rope spool", "weather vane", "river stone"],
+}
+
 # ============================================================
 # NARRATIVE ARC — 4 phases that transform the world
 # ============================================================
@@ -143,6 +166,8 @@ class World:
                 "visitors": [],
             },
         }
+        for room_name, items in ROOM_DISCOVERABLES.items():
+            self.rooms[room_name]["discoverables"] = list(items)
         
         # Characters (not NPCs — they have lives)
         self.characters = {
@@ -258,6 +283,14 @@ class World:
             "items_crafted": 0,
             "conflicts_resolved": 0,
             "nights_survived": 0,
+            "bridge_patched": False,
+            "bridge_secured": False,
+            "bridge_reinforced": False,
+            "bridge_lantern_lit": False,
+            "tower_cache_unlocked": False,
+            "threshold_marked": False,
+            "weather_readable": False,
+            "sunstone_socketed": False,
         }
     
     def tick_time(self):
@@ -376,6 +409,14 @@ class World:
                 desc += " Rain mists on the dark water below."
             if len(self.rooms["Bridge"]["carvings"]) > 1:
                 desc += f" There are {len(self.rooms['Bridge']['carvings'])} carvings now."
+            if self.state.get("bridge_patched"):
+                desc += " Cloth bindings keep the railing from splintering."
+            if self.state.get("bridge_secured"):
+                desc += " Rope lines keep the span steady against the flood."
+            if self.state.get("bridge_reinforced"):
+                desc += " Fresh iron nails hold the planks tight."
+            if self.state.get("bridge_lantern_lit"):
+                desc += " A lantern glows warm over the water."
         
         elif room_name == "Tower":
             power = self.state.get("tower_power_low", False)
@@ -384,6 +425,19 @@ class World:
             
             if self.rooms["Tower"]["messages"]:
                 desc += f" The whiteboard holds {len(self.rooms['Tower']['messages'])} rules."
+            if self.state.get("tower_cache_unlocked"):
+                desc += " A hidden cache stands open beneath the whiteboard."
+
+        if room_name == "Threshold" and self.state.get("threshold_marked"):
+            desc += " A chalk arrow points late arrivals toward shelter."
+        if room_name == "Garden" and self.state.get("weather_readable"):
+            desc += " The beds are arranged to catch whatever weather comes next."
+        if room_name == "Tower" and self.state.get("sunstone_socketed"):
+            desc += " A sunstone keeps the room lit with a stubborn amber glow."
+
+        discoverables = room.get("discoverables", [])
+        if discoverables:
+            desc += f" Discoverable items: {', '.join(discoverables)}."
         
         # Who's here
         here = [n for n, c in self.characters.items() if c["room"] == room_name and n != char_name]
@@ -485,6 +539,10 @@ class ActionSystem:
             "cost": 1,
             "description": "Take an item from the room",
         },
+        "use": {
+            "cost": 1,
+            "description": "Use an item from your inventory to change the world",
+        },
         "examine": {
             "cost": 0,
             "description": "Examine something in detail",
@@ -530,6 +588,13 @@ class ActionSystem:
         available.append("rest")
         available.append("examine")
         
+        discoverables = world.rooms[room].get("discoverables", [])
+        for item in discoverables:
+            available.append(f"take:{item}")
+
+        for item in char["inventory"]:
+            available.append(f"use:{item}")
+
         if char["inventory"]:
             available.append("give:item")
         
@@ -1072,6 +1137,76 @@ 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 _take_item(self, item_name, scene):
+        room_name = self.world.characters["Timmy"]["room"]
+        discoverables = self.world.rooms[room_name].get("discoverables", [])
+        if item_name not in discoverables:
+            scene["log"].append(f"There is no {item_name} here.")
+            return
+        discoverables.remove(item_name)
+        self.world.characters["Timmy"]["inventory"].append(item_name)
+        scene["log"].append(f"You take the {item_name}.")
+        if WORLD_ITEMS.get(item_name, {}).get("quest_item"):
+            scene["world_events"].append(f"The {item_name} feels important. It might open a quest route.")
+
+    def _use_item(self, item_name, scene):
+        inventory = self.world.characters["Timmy"]["inventory"]
+        if item_name not in inventory:
+            scene["log"].append(f"You are not carrying {item_name}.")
+            return
+        item = WORLD_ITEMS.get(item_name)
+        if not item:
+            scene["log"].append(f"The {item_name} doesn't seem to do anything.")
+            return
+
+        effect = item["effect"]
+        effect_text = item["effect_text"]
+        if effect == "grow_garden":
+            self.world.rooms["Garden"]["growth"] = min(5, self.world.rooms["Garden"]["growth"] + 2)
+            self.world.state["garden_drought"] = False
+        elif effect == "unlock_tower_cache":
+            self.world.state["tower_cache_unlocked"] = True
+            cache_rule = "Rule: Keys open more than doors when the world trusts you."
+            if cache_rule not in self.world.rooms["Tower"]["messages"]:
+                self.world.rooms["Tower"]["messages"].append(cache_rule)
+        elif effect == "write_notebook_rule":
+            note_rule = f"Rule #{self.world.tick}: A notebook can turn memory into structure."
+            self.world.rooms["Tower"]["messages"].append(note_rule)
+        elif effect == "patch_bridge":
+            self.world.state["bridge_patched"] = True
+            self.world.state["bridge_flooding"] = False
+            self.world.rooms["Bridge"]["weather"] = None
+            self.world.rooms["Bridge"]["rain_ticks"] = 0
+        elif effect == "stoke_forge":
+            self.world.rooms["Forge"]["fire"] = "glowing"
+            self.world.state["forge_fire_dying"] = False
+        elif effect == "light_bridge":
+            self.world.state["bridge_lantern_lit"] = True
+        elif effect == "secure_bridge":
+            self.world.state["bridge_secured"] = True
+            self.world.state["bridge_flooding"] = False
+            self.world.rooms["Bridge"]["weather"] = None
+            self.world.rooms["Bridge"]["rain_ticks"] = 0
+        elif effect == "mark_threshold":
+            self.world.state["threshold_marked"] = True
+        elif effect == "read_weather":
+            self.world.state["weather_readable"] = True
+            self.world.state["garden_drought"] = False
+        elif effect == "restore_tower_power":
+            self.world.state["tower_power_low"] = False
+            self.world.state["sunstone_socketed"] = True
+        elif effect == "reinforce_bridge":
+            self.world.state["bridge_reinforced"] = True
+            self.world.state["bridge_flooding"] = False
+        elif effect == "water_garden":
+            self.world.state["garden_drought"] = False
+            self.world.rooms["Garden"]["growth"] = min(5, self.world.rooms["Garden"]["growth"] + 1)
+
+        scene["log"].append(f"You use the {item_name}. {effect_text}")
+        scene["world_events"].append(effect_text)
+        if item.get("consumable"):
+            inventory.remove(item_name)
     
     def run_tick(self, timmy_action="look"):
         """Run one tick. Return the scene and available choices."""
@@ -1100,7 +1235,7 @@ class GameEngine:
         action_costs = {
             "move": 2, "tend_fire": 3, "write_rule": 2, "carve": 2,
             "plant": 2, "study": 2, "forge": 3, "help": 2, "speak": 1,
-            "listen": 0, "rest": -2, "examine": 0, "give": 0, "take": 1,
+            "listen": 0, "rest": -2, "examine": 0, "give": 0, "take": 1, "use": 1,
         }
         
         # Extract action name
@@ -1360,9 +1495,17 @@ class GameEngine:
         elif timmy_action == "examine":
             room = self.world.characters["Timmy"]["room"]
             room_data = self.world.rooms[room]
-            items = room_data.get("items", [])
+            items = room_data.get("items", []) + room_data.get("discoverables", [])
             scene["log"].append(f"You examine The {room}. You see: {', '.join(items) if items else 'nothing special'}")
         
+        elif timmy_action.startswith("take:"):
+            item_name = timmy_action.split(":", 1)[1]
+            self._take_item(item_name, scene)
+
+        elif timmy_action.startswith("use:"):
+            item_name = timmy_action.split(":", 1)[1]
+            self._use_item(item_name, scene)
+        
         elif timmy_action.startswith("help:"):
             # Help increases trust
             target_name = timmy_action.split(":")[1]

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_items.py

@@ -0,0 +1,58 @@
+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_items", 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 TestTowerGameWorldItems(unittest.TestCase):
+    def test_world_has_ten_unique_items_and_a_quest_item(self):
+        module = load_game_module()
+        world = module.World()
+
+        room_items = {
+            item
+            for room in world.rooms.values()
+            for item in room.get("discoverables", [])
+        }
+
+        self.assertGreaterEqual(len(room_items), 10)
+        self.assertIn("foraged key", room_items)
+        self.assertTrue(module.WORLD_ITEMS["foraged key"]["quest_item"])
+
+    def test_items_change_world_state_when_used(self):
+        module = load_game_module()
+        engine = module.GameEngine()
+        engine.start_new_game()
+        engine.world.characters["Timmy"]["energy"] = 10
+        engine.world.characters["Timmy"]["room"] = "Garden"
+
+        initial_growth = engine.world.rooms["Garden"]["growth"]
+        engine.run_tick("take:seed packet")
+        use_seed = engine.run_tick("use:seed packet")
+
+        self.assertGreater(engine.world.rooms["Garden"]["growth"], initial_growth)
+        self.assertNotIn("seed packet", engine.world.characters["Timmy"]["inventory"])
+        self.assertTrue(any("garden" in line.lower() for line in use_seed["world_events"] + use_seed["log"]))
+
+        engine.world.characters["Timmy"]["energy"] = 10
+        engine.run_tick("take:foraged key")
+        use_key = engine.run_tick("use:foraged key")
+
+        self.assertTrue(engine.world.state["tower_cache_unlocked"])
+        self.assertTrue(any("cache" in line.lower() or "quest" in line.lower() for line in use_key["world_events"] + use_key["log"]))
+
+
+if __name__ == "__main__":
+    unittest.main()