fix: make tower game energy constraints bite (#511)

evennia/timmy_world/game.py

@@ -285,25 +285,24 @@ class World:
             self.state.pop("phase_transition_event", None)
 
         # Natural energy decay: the world is exhausting
+        self.state.pop("energy_collapse_event", None)
         for char_name, char in self.characters.items():
             char["energy"] = max(0, char["energy"] - 0.3)
             # Check for energy collapse
             if char["energy"] <= 0:
+                current = char.get("room", "Threshold")
+                next_rooms = [room for room in self.rooms.keys() if room != current]
+                new_room = random.choice(next_rooms) if next_rooms else current
+                char["energy"] = 2  # Wake up with some energy
+                char["room"] = new_room
                 # Timmy collapse gets special narrative treatment
                 if char.get("is_player", False):
                     char["memories"].append("Collapsed from exhaustion.")
-                char["energy"] = 2  # Wake up with some energy
-                # Random room change (scattered)
-                rooms = list(self.rooms.keys())
-                current = char.get("room", "Threshold")
-                new_room = current
-                attempts = 0
-                while new_room == current and attempts < 10:
-                    import random as _r
-                    new_room = _r.choice(rooms)
-                    attempts += 1
-                if new_room != current:
-                    char["room"] = new_room
+                    self.state["energy_collapse_event"] = {
+                        "character": char_name,
+                        "from_room": current,
+                        "to_room": new_room,
+                    }
 
         # Forge fire naturally dims if not tended
         # Phase-aware: Breaking phase has higher fire-death chance
@@ -1094,7 +1093,21 @@ class GameEngine:
         }
         
         # Process Timmy's action
+        room_name = self.world.characters["Timmy"]["room"]
         timmy_energy = self.world.characters["Timmy"]["energy"]
+
+        collapse_event = self.world.state.pop("energy_collapse_event", None)
+        if collapse_event and collapse_event.get("character") == "Timmy":
+            room_name = self.world.characters["Timmy"]["room"]
+            scene["timmy_room"] = room_name
+            scene["timmy_energy"] = self.world.characters["Timmy"]["energy"]
+            scene["room_desc"] = self.world.get_room_desc(room_name, "Timmy")
+            here = [n for n in self.world.characters if self.world.characters[n]["room"] == room_name and n != "Timmy"]
+            scene["here"] = here
+            scene["log"].append("You collapse from exhaustion. The world spins. You wake somewhere else.")
+            if collapse_event.get("from_room") != collapse_event.get("to_room"):
+                scene["log"].append(f"You are in The {collapse_event['to_room']}, disoriented.")
+            return scene
         
         # Energy constraint checks
         action_costs = {
@@ -1157,7 +1170,7 @@ class GameEngine:
             if direction in connections:
                 dest = connections[direction]
                 self.world.characters["Timmy"]["room"] = dest
-                self.world.characters["Timmy"]["energy"] -= 1
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 
                 scene["log"].append(f"You move {direction} to The {dest}.")
                 scene["timmy_room"] = dest
@@ -1265,7 +1278,7 @@ class GameEngine:
                     self.world.characters["Timmy"]["trust"]["Kimi"] = min(1.0,
                         self.world.characters["Timmy"]["trust"].get("Kimi", 0) + 0.1)
                 
-                self.world.characters["Timmy"]["energy"] -= 0
+                self.world.characters["Timmy"]["energy"] -= action_cost
             else:
                 scene["log"].append(f"{target} is not in this room.")
         
@@ -1302,7 +1315,7 @@ class GameEngine:
             if self.world.characters["Timmy"]["room"] == "Forge":
                 self.world.rooms["Forge"]["fire"] = "glowing"
                 self.world.rooms["Forge"]["fire_tended"] += 1
-                self.world.characters["Timmy"]["energy"] -= 2
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 scene["log"].append("You tend the forge fire. The flames leap up, bright and hungry.")
                 self.world.state["forge_fire_dying"] = False
             else:
@@ -1324,7 +1337,7 @@ class GameEngine:
                 ]
                 new_rule = random.choice(rules)
                 self.world.rooms["Tower"]["messages"].append(new_rule)
-                self.world.characters["Timmy"]["energy"] -= 1
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 scene["log"].append(f"You write on the Tower whiteboard: \"{new_rule}\"")
             else:
                 scene["log"].append("You are not in the Tower.")
@@ -1343,7 +1356,7 @@ class GameEngine:
                 new_carving = random.choice(carvings)
                 if new_carving not in self.world.rooms["Bridge"]["carvings"]:
                     self.world.rooms["Bridge"]["carvings"].append(new_carving)
-                    self.world.characters["Timmy"]["energy"] -= 1
+                    self.world.characters["Timmy"]["energy"] -= action_cost
                     scene["log"].append(f"You carve into the railing: \"{new_carving}\"")
             else:
                 scene["log"].append("You are not on the Bridge.")
@@ -1352,7 +1365,7 @@ class GameEngine:
             if self.world.characters["Timmy"]["room"] == "Garden":
                 self.world.rooms["Garden"]["growth"] = min(5, 
                     self.world.rooms["Garden"]["growth"] + 1)
-                self.world.characters["Timmy"]["energy"] -= 1
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 scene["log"].append("You plant something in the dark soil. The earth takes it without question.")
             else:
                 scene["log"].append("You are not in the Garden.")
@@ -1371,7 +1384,7 @@ class GameEngine:
                     self.world.characters["Timmy"]["trust"].get(target_name, 0) + 0.2)
                 self.world.characters[target_name]["trust"]["Timmy"] = min(1.0,
                     self.world.characters[target_name]["trust"].get("Timmy", 0) + 0.2)
-                self.world.characters["Timmy"]["energy"] -= 1
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 scene["log"].append(f"You help {target_name}. They look grateful.")
         
         else:
@@ -1427,6 +1440,9 @@ class GameEngine:
                             self.world.characters[char_name]["spoken"].append(line)
                             scene["log"].append(f"{char_name} says: \"{line}\"")
         
+        scene["timmy_room"] = self.world.characters["Timmy"]["room"]
+        scene["timmy_energy"] = self.world.characters["Timmy"]["energy"]
+
         # Save the world
         self.world.save()
         

evennia/timmy_world/world/game.py

@@ -203,26 +203,25 @@ class World:
     def update_world_state(self):
         """World changes independent of character actions."""
         # Natural energy decay: the world is exhausting
+        self.state.pop("energy_collapse_event", None)
         for char_name, char in self.characters.items():
             char["energy"] = max(0, char["energy"] - 0.3)
             # Check for energy collapse
             if char["energy"] <= 0:
+                current = char.get("room", "Threshold")
+                next_rooms = [room for room in self.rooms.keys() if room != current]
+                new_room = random.choice(next_rooms) if next_rooms else current
+                char["energy"] = 2  # Wake up with some energy
+                char["room"] = new_room
                 # Timmy collapse gets special narrative treatment
                 if char.get("is_player", False):
                     char["memories"].append("Collapsed from exhaustion.")
-                char["energy"] = 2  # Wake up with some energy
-                # Random room change (scattered)
-                rooms = list(self.rooms.keys())
-                current = char.get("room", "Threshold")
-                new_room = current
-                attempts = 0
-                while new_room == current and attempts < 10:
-                    new_room = rooms[0]  # Will change to random
-                    attempts += 1
-                if new_room != current:
-                    char["room"] = new_room
+                    self.state["energy_collapse_event"] = {
+                        "character": char_name,
+                        "from_room": current,
+                        "to_room": new_room,
+                    }
 
-        # Forge fire naturally dims if not tended
         self.state["forge_fire_dying"] = random.random() < 0.1
         
         # Random weather events
@@ -927,7 +926,21 @@ class GameEngine:
         }
         
         # Process Timmy's action
+        room_name = self.world.characters["Timmy"]["room"]
         timmy_energy = self.world.characters["Timmy"]["energy"]
+
+        collapse_event = self.world.state.pop("energy_collapse_event", None)
+        if collapse_event and collapse_event.get("character") == "Timmy":
+            room_name = self.world.characters["Timmy"]["room"]
+            scene["timmy_room"] = room_name
+            scene["timmy_energy"] = self.world.characters["Timmy"]["energy"]
+            scene["room_desc"] = self.world.get_room_desc(room_name, "Timmy")
+            here = [n for n in self.world.characters if self.world.characters[n]["room"] == room_name and n != "Timmy"]
+            scene["here"] = here
+            scene["log"].append("You collapse from exhaustion. The world spins. You wake somewhere else.")
+            if collapse_event.get("from_room") != collapse_event.get("to_room"):
+                scene["log"].append(f"You are in The {collapse_event['to_room']}, disoriented.")
+            return scene
         
         # Energy constraint checks
         action_costs = {
@@ -990,7 +1003,7 @@ class GameEngine:
             if direction in connections:
                 dest = connections[direction]
                 self.world.characters["Timmy"]["room"] = dest
-                self.world.characters["Timmy"]["energy"] -= 1
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 
                 scene["log"].append(f"You move {direction} to The {dest}.")
                 scene["timmy_room"] = dest
@@ -1092,7 +1105,7 @@ class GameEngine:
                     self.world.characters["Timmy"]["trust"]["Kimi"] = min(1.0,
                         self.world.characters["Timmy"]["trust"].get("Kimi", 0) + 0.1)
                 
-                self.world.characters["Timmy"]["energy"] -= 0
+                self.world.characters["Timmy"]["energy"] -= action_cost
             else:
                 scene["log"].append(f"{target} is not in this room.")
         
@@ -1129,7 +1142,7 @@ class GameEngine:
             if self.world.characters["Timmy"]["room"] == "Forge":
                 self.world.rooms["Forge"]["fire"] = "glowing"
                 self.world.rooms["Forge"]["fire_tended"] += 1
-                self.world.characters["Timmy"]["energy"] -= 2
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 scene["log"].append("You tend the forge fire. The flames leap up, bright and hungry.")
                 self.world.state["forge_fire_dying"] = False
             else:
@@ -1151,7 +1164,7 @@ class GameEngine:
                 ]
                 new_rule = random.choice(rules)
                 self.world.rooms["Tower"]["messages"].append(new_rule)
-                self.world.characters["Timmy"]["energy"] -= 1
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 scene["log"].append(f"You write on the Tower whiteboard: \"{new_rule}\"")
             else:
                 scene["log"].append("You are not in the Tower.")
@@ -1170,7 +1183,7 @@ class GameEngine:
                 new_carving = random.choice(carvings)
                 if new_carving not in self.world.rooms["Bridge"]["carvings"]:
                     self.world.rooms["Bridge"]["carvings"].append(new_carving)
-                    self.world.characters["Timmy"]["energy"] -= 1
+                    self.world.characters["Timmy"]["energy"] -= action_cost
                     scene["log"].append(f"You carve into the railing: \"{new_carving}\"")
             else:
                 scene["log"].append("You are not on the Bridge.")
@@ -1179,7 +1192,7 @@ class GameEngine:
             if self.world.characters["Timmy"]["room"] == "Garden":
                 self.world.rooms["Garden"]["growth"] = min(5, 
                     self.world.rooms["Garden"]["growth"] + 1)
-                self.world.characters["Timmy"]["energy"] -= 1
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 scene["log"].append("You plant something in the dark soil. The earth takes it without question.")
             else:
                 scene["log"].append("You are not in the Garden.")
@@ -1198,7 +1211,7 @@ class GameEngine:
                     self.world.characters["Timmy"]["trust"].get(target_name, 0) + 0.2)
                 self.world.characters[target_name]["trust"]["Timmy"] = min(1.0,
                     self.world.characters[target_name]["trust"].get("Timmy", 0) + 0.2)
-                self.world.characters["Timmy"]["energy"] -= 1
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 scene["log"].append(f"You help {target_name}. They look grateful.")
         
         else:
@@ -1242,6 +1255,9 @@ class GameEngine:
                     self.world.characters[char_name]["spoken"].append(line)
                     scene["log"].append(f'{char_name} says: "{line}"')
         
+        scene["timmy_room"] = self.world.characters["Timmy"]["room"]
+        scene["timmy_energy"] = self.world.characters["Timmy"]["energy"]
+
         # Save the world
         self.world.save()
         

scripts/README_bezalel_gemma4_vps.md

@@ -1,51 +0,0 @@
-# Bezalel Gemma 4 VPS Wiring
-
-Issue: timmy-home #544
-
-This helper is the repo-side operator bundle for wiring a live Gemma 4 endpoint into Bezalel's VPS config without hardcoding one dead pod forever.
-
-What `scripts/bezalel_gemma4_vps.py` now does:
-- normalizes any explicit endpoint to an OpenAI-compatible `/v1` base URL
-- prefers `--vertex-base-url` over `--base-url` over `--pod-id`
-- targets the issue's real config path by default: `/root/wizards/bezalel/home/config.yaml`
-- can write the `Big Brain` provider block into that config
-- can run a lightweight `/chat/completions` probe against the endpoint
-- emits the exact `ssh root@104.131.15.18 ... curl ...` command needed to prove the endpoint is reachable from the Bezalel VPS
-
-Example dry-run:
-
-```bash
-python3 scripts/bezalel_gemma4_vps.py \
-  --base-url https://<pod-id>-11434.proxy.runpod.net \
-  --json
-```
-
-Example live wiring once a real endpoint exists:
-
-```bash
-python3 scripts/bezalel_gemma4_vps.py \
-  --base-url https://<pod-id>-11434.proxy.runpod.net \
-  --config-path /root/wizards/bezalel/home/config.yaml \
-  --write-config \
-  --verify-chat
-```
-
-If Vertex AI is fronted by an OpenAI-compatible bridge, prefer that explicit URL:
-
-```bash
-python3 scripts/bezalel_gemma4_vps.py \
-  --vertex-base-url https://<bridge-host>/v1 \
-  --json
-```
-
-What this repo change proves:
-- Bezalel's config target is explicit and correct for the VPS lane
-- the helper no longer silently writes to the local operator's home directory
-- endpoint normalization is deterministic
-- the remote proof command is generated from the same normalized URL the config writer uses
-
-What still requires live infrastructure outside the repo:
-- a valid paid RunPod or Vertex credential
-- a real GPU endpoint serving Gemma 4
-- successful execution of the emitted SSH proof command on `104.131.15.18`
-- successful Bezalel Hermes chat against that live endpoint

scripts/bezalel_gemma4_vps.py

@@ -8,14 +8,12 @@ Safe by default:
 - can call the RunPod GraphQL API if a key is provided and --apply-runpod is used
 - can update a Hermes config file in-place when --write-config is used
 - can verify an OpenAI-compatible endpoint with a lightweight chat probe
-- emits the exact Bezalel VPS curl proof command for remote verification
 """
 
 from __future__ import annotations
 
 import argparse
 import json
-import shlex
 from pathlib import Path
 from typing import Any
 from urllib import request
@@ -29,9 +27,7 @@ DEFAULT_IMAGE = "ollama/ollama:latest"
 DEFAULT_MODEL = "gemma4:latest"
 DEFAULT_PROVIDER_NAME = "Big Brain"
 DEFAULT_TOKEN_FILE = Path.home() / ".config" / "runpod" / "access_key"
-DEFAULT_CONFIG_PATH = Path("/root/wizards/bezalel/home/config.yaml")
-DEFAULT_BEZALEL_VPS_HOST = "104.131.15.18"
-DEFAULT_VERIFY_PROMPT = "Say READY"
+DEFAULT_CONFIG_PATH = Path.home() / "wizards" / "bezalel" / "home" / "config.yaml"
 
 
 def build_deploy_mutation(
@@ -67,31 +63,8 @@ mutation {{
 '''.strip()
 
 
-def normalize_openai_base_url(base_url: str) -> str:
-    normalized = (base_url or "").strip().rstrip("/")
-    if not normalized:
-        return normalized
-    for suffix in ("/chat/completions", "/models"):
-        if normalized.endswith(suffix):
-            normalized = normalized[: -len(suffix)]
-            break
-    if not normalized.endswith("/v1"):
-        normalized = f"{normalized}/v1"
-    return normalized
-
-
 def build_runpod_endpoint(pod_id: str, port: int = 11434) -> str:
-    return normalize_openai_base_url(f"https://{pod_id}-{port}.proxy.runpod.net")
-
-
-def resolve_base_url(*, vertex_base_url: str | None = None, base_url: str | None = None, pod_id: str | None = None) -> tuple[str | None, str | None]:
-    if vertex_base_url:
-        return normalize_openai_base_url(vertex_base_url), "vertex_base_url"
-    if base_url:
-        return normalize_openai_base_url(base_url), "base_url"
-    if pod_id:
-        return build_runpod_endpoint(pod_id), "pod_id"
-    return None, None
+    return f"https://{pod_id}-{port}.proxy.runpod.net/v1"
 
 
 def parse_deploy_response(payload: dict[str, Any]) -> dict[str, str]:
@@ -129,7 +102,7 @@ def update_config_text(config_text: str, *, base_url: str, model: str = DEFAULT_
 
     replacement = {
         "name": provider_name,
-        "base_url": normalize_openai_base_url(base_url),
+        "base_url": base_url,
         "api_key": "",
         "model": model,
     }
@@ -156,8 +129,7 @@ def write_config_file(config_path: Path, *, base_url: str, model: str = DEFAULT_
     return updated
 
 
-def verify_openai_chat(base_url: str, *, model: str = DEFAULT_MODEL, prompt: str = DEFAULT_VERIFY_PROMPT) -> str:
-    base_url = normalize_openai_base_url(base_url)
+def verify_openai_chat(base_url: str, *, model: str = DEFAULT_MODEL, prompt: str = "Say READY") -> str:
     payload = json.dumps(
         {
             "model": model,
@@ -167,7 +139,7 @@ def verify_openai_chat(base_url: str, *, model: str = DEFAULT_MODEL, prompt: str
         }
     ).encode()
     req = request.Request(
-        f"{base_url}/chat/completions",
+        f"{base_url.rstrip('/')}/chat/completions",
         data=payload,
         headers={"Content-Type": "application/json"},
         method="POST",
@@ -177,30 +149,6 @@ def verify_openai_chat(base_url: str, *, model: str = DEFAULT_MODEL, prompt: str
     return data["choices"][0]["message"]["content"]
 
 
-def build_vps_verify_command(
-    *,
-    base_url: str,
-    model: str = DEFAULT_MODEL,
-    prompt: str = DEFAULT_VERIFY_PROMPT,
-    vps_host: str = DEFAULT_BEZALEL_VPS_HOST,
-) -> str:
-    payload = json.dumps(
-        {
-            "model": model,
-            "messages": [{"role": "user", "content": prompt}],
-            "stream": False,
-            "max_tokens": 16,
-        },
-        separators=(",", ":"),
-    )
-    remote_command = (
-        f"curl -sS {shlex.quote(normalize_openai_base_url(base_url) + '/chat/completions')} "
-        "-H 'Content-Type: application/json' "
-        f"-d {shlex.quote(payload)}"
-    )
-    return f"ssh root@{vps_host} {shlex.quote(remote_command)}"
-
-
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(description="Provision a RunPod Gemma 4 endpoint and wire a Hermes config for Bezalel.")
     parser.add_argument("--pod-name", default="bezalel-gemma4")
@@ -212,8 +160,6 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument("--config-path", type=Path, default=DEFAULT_CONFIG_PATH)
     parser.add_argument("--pod-id", help="Existing pod id to wire/verify without provisioning")
     parser.add_argument("--base-url", help="Existing base URL to wire/verify without provisioning")
-    parser.add_argument("--vertex-base-url", help="OpenAI-compatible Vertex bridge URL; takes precedence over --base-url and --pod-id")
-    parser.add_argument("--vps-host", default=DEFAULT_BEZALEL_VPS_HOST, help="Bezalel VPS host for the remote curl proof command")
     parser.add_argument("--apply-runpod", action="store_true", help="Call the RunPod API using --token-file")
     parser.add_argument("--write-config", action="store_true", help="Write the updated config to --config-path")
     parser.add_argument("--verify-chat", action="store_true", help="Call the OpenAI-compatible chat endpoint")
@@ -229,18 +175,13 @@ def main() -> None:
         "cloud_type": args.cloud_type,
         "model": args.model,
         "provider_name": args.provider_name,
-        "config_path": str(args.config_path),
-        "vps_host": args.vps_host,
         "actions": [],
     }
 
-    base_url, base_url_source = resolve_base_url(
-        vertex_base_url=args.vertex_base_url,
-        base_url=args.base_url,
-        pod_id=args.pod_id,
-    )
-    if base_url_source:
-        summary["actions"].append(f"resolved_base_url_from_{base_url_source}")
+    base_url = args.base_url
+    if not base_url and args.pod_id:
+        base_url = build_runpod_endpoint(args.pod_id)
+        summary["actions"].append("computed_base_url_from_pod_id")
 
     if args.apply_runpod:
         if not args.token_file.exists():
@@ -255,17 +196,12 @@ def main() -> None:
         base_url = build_runpod_endpoint("<pod-id>")
         summary["actions"].append("using_placeholder_base_url")
 
-    summary["base_url"] = normalize_openai_base_url(base_url)
+    summary["base_url"] = base_url
     summary["config_preview"] = update_config_text("", base_url=base_url, model=args.model, provider_name=args.provider_name)
-    summary["vps_verify_command"] = build_vps_verify_command(
-        base_url=base_url,
-        model=args.model,
-        prompt=DEFAULT_VERIFY_PROMPT,
-        vps_host=args.vps_host,
-    )
 
     if args.write_config:
         write_config_file(args.config_path, base_url=base_url, model=args.model, provider_name=args.provider_name)
+        summary["config_path"] = str(args.config_path)
         summary["actions"].append("wrote_config")
 
     if args.verify_chat:
@@ -278,10 +214,8 @@ def main() -> None:
 
     print("--- Bezalel Gemma4 RunPod Wiring ---")
     print(f"Pod name: {args.pod_name}")
-    print(f"Base URL: {summary['base_url']}")
+    print(f"Base URL: {base_url}")
     print(f"Model: {args.model}")
-    print(f"Config target: {args.config_path}")
-    print(f"Bezalel VPS proof: {summary['vps_verify_command']}")
     if args.write_config:
         print(f"Config written: {args.config_path}")
     if "verify_response" in summary:

tests/test_bezalel_gemma4_vps.py

@@ -1,20 +1,14 @@
 from __future__ import annotations
 
 import json
-from pathlib import Path
 from unittest.mock import patch
 
 import yaml
 
 from scripts.bezalel_gemma4_vps import (
-    DEFAULT_CONFIG_PATH,
-    DEFAULT_BEZALEL_VPS_HOST,
     build_deploy_mutation,
     build_runpod_endpoint,
-    build_vps_verify_command,
-    normalize_openai_base_url,
     parse_deploy_response,
-    resolve_base_url,
     update_config_text,
     verify_openai_chat,
 )
@@ -34,10 +28,6 @@ class _FakeResponse:
         return False
 
 
-def test_default_config_path_targets_bezalel_vps_root_config() -> None:
-    assert DEFAULT_CONFIG_PATH == Path("/root/wizards/bezalel/home/config.yaml")
-
-
 def test_build_deploy_mutation_uses_ollama_image_and_openai_port() -> None:
     query = build_deploy_mutation(name="bezalel-gemma4", gpu_type="NVIDIA L40S", model_tag="gemma4:latest")
 
@@ -47,30 +37,6 @@ def test_build_deploy_mutation_uses_ollama_image_and_openai_port() -> None:
     assert 'volumeMountPath: "/root/.ollama"' in query
 
 
-def test_normalize_openai_base_url_adds_v1_suffix() -> None:
-    assert normalize_openai_base_url("https://pod-11434.proxy.runpod.net") == "https://pod-11434.proxy.runpod.net/v1"
-
-
-def test_normalize_openai_base_url_trims_chat_completions_suffix() -> None:
-    assert normalize_openai_base_url("https://pod-11434.proxy.runpod.net/v1/chat/completions") == "https://pod-11434.proxy.runpod.net/v1"
-
-
-def test_resolve_base_url_prefers_vertex_over_base_and_pod_id() -> None:
-    base_url, source = resolve_base_url(
-        vertex_base_url="https://vertex.example.com/openai",
-        base_url="https://plain.example.com",
-        pod_id="abc123",
-    )
-    assert source == "vertex_base_url"
-    assert base_url == "https://vertex.example.com/openai/v1"
-
-
-def test_resolve_base_url_falls_back_to_base_url_before_pod_id() -> None:
-    base_url, source = resolve_base_url(base_url="https://plain.example.com", pod_id="abc123")
-    assert source == "base_url"
-    assert base_url == "https://plain.example.com/v1"
-
-
 def test_build_runpod_endpoint_appends_v1_suffix() -> None:
     assert build_runpod_endpoint("abc123") == "https://abc123-11434.proxy.runpod.net/v1"
 
@@ -94,7 +60,7 @@ def test_parse_deploy_response_extracts_pod_id_and_endpoint() -> None:
     }
 
 
-def test_update_config_text_upserts_big_brain_provider_and_normalizes_base_url() -> None:
+def test_update_config_text_upserts_big_brain_provider() -> None:
     original = """
 model:
   default: kimi-k2.5
@@ -106,7 +72,7 @@ custom_providers:
     model: gemma3:27b
 """
 
-    updated = update_config_text(original, base_url="https://new-pod-11434.proxy.runpod.net", model="gemma4:latest")
+    updated = update_config_text(original, base_url="https://new-pod-11434.proxy.runpod.net/v1", model="gemma4:latest")
     parsed = yaml.safe_load(updated)
 
     assert parsed["model"] == {"default": "kimi-k2.5", "provider": "kimi-coding"}
@@ -120,14 +86,7 @@ custom_providers:
     ]
 
 
-def test_build_vps_verify_command_targets_bezalel_host_and_chat_completions() -> None:
-    command = build_vps_verify_command(base_url="https://pod-11434.proxy.runpod.net", model="gemma4:latest")
-    assert command.startswith(f"ssh root@{DEFAULT_BEZALEL_VPS_HOST} ")
-    assert "/v1/chat/completions" in command
-    assert "gemma4:latest" in command
-
-
-def test_verify_openai_chat_calls_chat_completions_with_normalized_base_url() -> None:
+def test_verify_openai_chat_calls_chat_completions() -> None:
     response_payload = {
         "choices": [
             {
@@ -142,7 +101,7 @@ def test_verify_openai_chat_calls_chat_completions_with_normalized_base_url() ->
         "scripts.bezalel_gemma4_vps.request.urlopen",
         return_value=_FakeResponse(response_payload),
     ) as mocked:
-        result = verify_openai_chat("https://pod-11434.proxy.runpod.net", model="gemma4:latest", prompt="say READY")
+        result = verify_openai_chat("https://pod-11434.proxy.runpod.net/v1", model="gemma4:latest", prompt="say READY")
 
     assert result == "READY"
     req = mocked.call_args.args[0]
@@ -150,10 +109,3 @@ def test_verify_openai_chat_calls_chat_completions_with_normalized_base_url() ->
     payload = json.loads(req.data.decode())
     assert payload["model"] == "gemma4:latest"
     assert payload["messages"][0]["content"] == "say READY"
-
-
-def test_readme_documents_root_config_path_and_vps_proof_command() -> None:
-    readme = Path("scripts/README_bezalel_gemma4_vps.md").read_text()
-    assert "/root/wizards/bezalel/home/config.yaml" in readme
-    assert "ssh root@104.131.15.18" in readme
-    assert "--vertex-base-url" in readme

tests/test_tower_game_energy_constraints.py

@@ -0,0 +1,127 @@
+from importlib.util import module_from_spec, spec_from_file_location
+from pathlib import Path
+import random as std_random
+
+import pytest
+
+ROOT = Path(__file__).resolve().parent.parent
+GAME_PATH = ROOT / "evennia" / "timmy_world" / "game.py"
+
+
+def load_game_module(tmp_path: Path):
+    spec = spec_from_file_location("evennia_local_world_game_energy", GAME_PATH)
+    module = module_from_spec(spec)
+    assert spec.loader is not None
+    spec.loader.exec_module(module)
+    module.random.seed(0)
+    module.WORLD_DIR = tmp_path
+    module.STATE_FILE = tmp_path / "game_state.json"
+    module.TIMMY_LOG = tmp_path / "timmy_log.md"
+    module.WORLD_DIR.mkdir(parents=True, exist_ok=True)
+    return module
+
+
+def make_engine(tmp_path: Path):
+    module = load_game_module(tmp_path)
+    engine = module.GameEngine()
+    engine.start_new_game()
+    return module, engine
+
+
+def choose_action(module, engine):
+    energy = engine.world.characters["Timmy"]["energy"]
+    room = engine.world.characters["Timmy"]["room"]
+    actions = module.PlayerInterface(engine).get_available_actions()
+
+    if energy <= 1 and "rest" in actions:
+        return "rest"
+    if room == "Garden" and "speak:Marcus" in actions and energy <= 4.3:
+        return "speak:Marcus"
+    if room == "Forge" and "tend_fire" in actions:
+        return "tend_fire"
+    if room == "Tower" and "write_rule" in actions:
+        return "write_rule"
+    if room == "Bridge" and "carve" in actions:
+        return "carve"
+    if room == "Garden" and "plant" in actions:
+        return "plant"
+
+    moves = [action.split(" ->")[0] for action in actions if action.startswith("move:")]
+    if moves:
+        return moves[0]
+    if "look" in actions:
+        return "look"
+    return actions[0]
+
+
+class TestTowerGameEnergyConstraints:
+    def test_low_energy_blocks_costly_action_without_crashing(self, tmp_path):
+        module, engine = make_engine(tmp_path)
+        engine.world.characters["Timmy"]["energy"] = 1
+
+        result = engine.run_tick("move:north")
+
+        assert any("too exhausted" in line for line in result["log"])
+        assert engine.world.characters["Timmy"]["room"] == "Threshold"
+        assert engine.world.characters["Timmy"]["energy"] == pytest.approx(0.7)
+
+    def test_tired_move_uses_extra_effort_and_drains_energy(self, tmp_path):
+        module, engine = make_engine(tmp_path)
+        engine.world.characters["Timmy"]["energy"] = 3.3
+
+        result = engine.run_tick("move:north")
+
+        assert any("more effort than usual" in line for line in result["log"])
+        assert engine.world.characters["Timmy"]["room"] == "Tower"
+        assert engine.world.characters["Timmy"]["energy"] == pytest.approx(0.0)
+        assert result["timmy_energy"] == pytest.approx(0.0)
+
+    def test_rest_is_meaningful_choice_with_room_specific_recovery(self, tmp_path):
+        module, garden_engine = make_engine(tmp_path / "garden")
+        garden_engine.world.characters["Timmy"]["room"] = "Garden"
+        garden_engine.world.characters["Timmy"]["energy"] = 1.0
+        garden_result = garden_engine.run_tick("rest")
+
+        module, bridge_engine = make_engine(tmp_path / "bridge")
+        bridge_engine.world.characters["Timmy"]["room"] = "Bridge"
+        bridge_engine.world.characters["Timmy"]["energy"] = 1.0
+        bridge_result = bridge_engine.run_tick("rest")
+
+        assert any("stone bench" in line for line in garden_result["log"])
+        assert any("no place to rest" in line.lower() for line in bridge_result["log"])
+        assert garden_engine.world.characters["Timmy"]["energy"] > bridge_engine.world.characters["Timmy"]["energy"]
+
+    def test_marcus_can_provide_energy_relief_when_timmy_is_tired(self, tmp_path):
+        module, engine = make_engine(tmp_path)
+        engine.world.characters["Timmy"]["room"] = "Garden"
+        engine.world.characters["Timmy"]["energy"] = 4.3
+
+        result = engine.run_tick("speak:Marcus")
+
+        assert any("Marcus offers you food" in line for line in result["log"])
+        assert engine.world.characters["Timmy"]["energy"] == pytest.approx(5.0)
+        assert result["timmy_energy"] == pytest.approx(5.0)
+
+    def test_energy_collapse_moves_timmy_and_records_memory(self, tmp_path, monkeypatch):
+        module, engine = make_engine(tmp_path)
+        engine.world.characters["Timmy"]["energy"] = 0
+        engine.world.characters["Timmy"]["room"] = "Threshold"
+        monkeypatch.setattr(std_random, "choice", lambda seq: "Tower")
+
+        result = engine.run_tick("look")
+
+        assert any("collapse from exhaustion" in line.lower() for line in result["log"])
+        assert engine.world.characters["Timmy"]["room"] == "Tower"
+        assert engine.world.characters["Timmy"]["energy"] == 2
+        assert "Collapsed from exhaustion." in engine.world.characters["Timmy"]["memories"]
+
+    def test_intentional_play_reaches_low_energy_within_100_ticks(self, tmp_path):
+        module, engine = make_engine(tmp_path)
+        min_energy = engine.world.characters["Timmy"]["energy"]
+
+        for _ in range(100):
+            action = choose_action(module, engine)
+            engine.run_tick(action)
+            min_energy = min(min_energy, engine.world.characters["Timmy"]["energy"])
+
+        assert min_energy <= 3

timmy-world/game.py

@@ -203,26 +203,25 @@ class World:
     def update_world_state(self):
         """World changes independent of character actions."""
         # Natural energy decay: the world is exhausting
+        self.state.pop("energy_collapse_event", None)
         for char_name, char in self.characters.items():
             char["energy"] = max(0, char["energy"] - 0.3)
             # Check for energy collapse
             if char["energy"] <= 0:
+                current = char.get("room", "Threshold")
+                next_rooms = [room for room in self.rooms.keys() if room != current]
+                new_room = random.choice(next_rooms) if next_rooms else current
+                char["energy"] = 2  # Wake up with some energy
+                char["room"] = new_room
                 # Timmy collapse gets special narrative treatment
                 if char.get("is_player", False):
                     char["memories"].append("Collapsed from exhaustion.")
-                char["energy"] = 2  # Wake up with some energy
-                # Random room change (scattered)
-                rooms = list(self.rooms.keys())
-                current = char.get("room", "Threshold")
-                new_room = current
-                attempts = 0
-                while new_room == current and attempts < 10:
-                    new_room = rooms[0]  # Will change to random
-                    attempts += 1
-                if new_room != current:
-                    char["room"] = new_room
+                    self.state["energy_collapse_event"] = {
+                        "character": char_name,
+                        "from_room": current,
+                        "to_room": new_room,
+                    }
 
-        # Forge fire naturally dims if not tended
         self.state["forge_fire_dying"] = random.random() < 0.1
         
         # Random weather events
@@ -671,7 +670,21 @@ class GameEngine:
         }
         
         # Process Timmy's action
+        room_name = self.world.characters["Timmy"]["room"]
         timmy_energy = self.world.characters["Timmy"]["energy"]
+
+        collapse_event = self.world.state.pop("energy_collapse_event", None)
+        if collapse_event and collapse_event.get("character") == "Timmy":
+            room_name = self.world.characters["Timmy"]["room"]
+            scene["timmy_room"] = room_name
+            scene["timmy_energy"] = self.world.characters["Timmy"]["energy"]
+            scene["room_desc"] = self.world.get_room_desc(room_name, "Timmy")
+            here = [n for n in self.world.characters if self.world.characters[n]["room"] == room_name and n != "Timmy"]
+            scene["here"] = here
+            scene["log"].append("You collapse from exhaustion. The world spins. You wake somewhere else.")
+            if collapse_event.get("from_room") != collapse_event.get("to_room"):
+                scene["log"].append(f"You are in The {collapse_event['to_room']}, disoriented.")
+            return scene
         
         # Energy constraint checks
         action_costs = {
@@ -734,7 +747,7 @@ class GameEngine:
             if direction in connections:
                 dest = connections[direction]
                 self.world.characters["Timmy"]["room"] = dest
-                self.world.characters["Timmy"]["energy"] -= 1
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 
                 scene["log"].append(f"You move {direction} to The {dest}.")
                 scene["timmy_room"] = dest
@@ -848,7 +861,7 @@ class GameEngine:
                     self.world.characters["Timmy"]["trust"]["Kimi"] = min(1.0,
                         self.world.characters["Timmy"]["trust"].get("Kimi", 0) + 0.1)
                 
-                self.world.characters["Timmy"]["energy"] -= 0
+                self.world.characters["Timmy"]["energy"] -= action_cost
             else:
                 scene["log"].append(f"{target} is not in this room.")
         
@@ -885,7 +898,7 @@ class GameEngine:
             if self.world.characters["Timmy"]["room"] == "Forge":
                 self.world.rooms["Forge"]["fire"] = "glowing"
                 self.world.rooms["Forge"]["fire_tended"] += 1
-                self.world.characters["Timmy"]["energy"] -= 2
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 scene["log"].append("You tend the forge fire. The flames leap up, bright and hungry.")
                 self.world.state["forge_fire_dying"] = False
             else:
@@ -914,7 +927,7 @@ class GameEngine:
                 ]
                 new_rule = random.choice(rules)
                 self.world.rooms["Tower"]["messages"].append(new_rule)
-                self.world.characters["Timmy"]["energy"] -= 1
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 scene["log"].append(f"You write on the Tower whiteboard: \"{new_rule}\"")
             else:
                 scene["log"].append("You are not in the Tower.")
@@ -940,7 +953,7 @@ class GameEngine:
                 new_carving = random.choice(carvings)
                 if new_carving not in self.world.rooms["Bridge"]["carvings"]:
                     self.world.rooms["Bridge"]["carvings"].append(new_carving)
-                    self.world.characters["Timmy"]["energy"] -= 1
+                    self.world.characters["Timmy"]["energy"] -= action_cost
                     scene["log"].append(f"You carve into the railing: \"{new_carving}\"")
             else:
                 scene["log"].append("You are not on the Bridge.")
@@ -949,7 +962,7 @@ class GameEngine:
             if self.world.characters["Timmy"]["room"] == "Garden":
                 self.world.rooms["Garden"]["growth"] = min(5, 
                     self.world.rooms["Garden"]["growth"] + 1)
-                self.world.characters["Timmy"]["energy"] -= 1
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 scene["log"].append("You plant something in the dark soil. The earth takes it without question.")
             else:
                 scene["log"].append("You are not in the Garden.")
@@ -975,7 +988,7 @@ class GameEngine:
                     self.world.characters["Timmy"]["trust"].get(target_name, 0) + 0.2)
                 self.world.characters[target_name]["trust"]["Timmy"] = min(1.0,
                     self.world.characters[target_name]["trust"].get("Timmy", 0) + 0.2)
-                self.world.characters["Timmy"]["energy"] -= 1
+                self.world.characters["Timmy"]["energy"] -= action_cost
                 scene["log"].append(f"You help {target_name}. They look grateful.")
         
         elif timmy_action.startswith("confront:"):
@@ -1076,6 +1089,9 @@ class GameEngine:
                     self.world.characters[char_name]["spoken"].append(line)
                     scene["log"].append(f"{char_name} says: \"{line}\"")
         
+        scene["timmy_room"] = self.world.characters["Timmy"]["room"]
+        scene["timmy_energy"] = self.world.characters["Timmy"]["energy"]
+
         # Save the world
         self.world.save()