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

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

@@ -1,245 +0,0 @@
-#!/usr/bin/env python3
-"""Fleet cost report generator.
-
-Reads Timmy's sovereignty metrics database and estimates paid API spend by
-agent/provider lane. Default output targets the local timmy-config reports
-folder so the cost report can be filed from the sidecar repo.
-"""
-
-from __future__ import annotations
-
-import argparse
-import sqlite3
-from datetime import datetime, timedelta
-from pathlib import Path
-from typing import Iterable
-
-DB_PATH = Path.home() / ".timmy" / "metrics" / "model_metrics.db"
-
-
-AGENT_LANES = (
-    {
-        "agent": "Timmy Cloud Lane",
-        "provider": "OpenRouter",
-        "patterns": ("openrouter/", "google/", "deepseek/", "x-ai/", "mistral/"),
-        "notes": "Cloud fallback and external reasoning routed through OpenRouter-compatible lanes.",
-    },
-    {
-        "agent": "Ezra",
-        "provider": "Anthropic",
-        "patterns": ("claude-", "anthropic/claude"),
-        "notes": "Archivist / long-form reasoning house on Claude-family models.",
-    },
-    {
-        "agent": "Bezalel",
-        "provider": "OpenAI",
-        "patterns": ("gpt-", "openai/", "codex"),
-        "notes": "Forge / implementation house on Codex/OpenAI-backed execution lanes.",
-    },
-    {
-        "agent": "Allegro",
-        "provider": "Kimi / Moonshot",
-        "patterns": ("kimi", "moonshot"),
-        "notes": "Tempo-and-dispatch house on Kimi / Moonshot direct API lanes.",
-    },
-)
-
-
-def default_report_path(report_date: str | None = None) -> Path:
-    if report_date is None:
-        report_date = datetime.now().strftime("%Y-%m-%d")
-    return Path.home() / "code" / "timmy-config" / "reports" / "production" / f"{report_date}-fleet-cost-report.md"
-
-
-def match_lane(model: str) -> dict | None:
-    lowered = (model or "").lower()
-    for lane in AGENT_LANES:
-        if any(pattern in lowered for pattern in lane["patterns"]):
-            return lane
-    return None
-
-
-def load_cost_rows(days: int = 30, db_path: Path = DB_PATH) -> list[tuple[str, int, int, int, float]]:
-    if not db_path.exists():
-        return []
-    cutoff = (datetime.now() - timedelta(days=days)).timestamp()
-    with sqlite3.connect(str(db_path)) as conn:
-        rows = conn.execute(
-            """
-            SELECT model, SUM(sessions), SUM(messages), SUM(tool_calls), SUM(est_cost_usd)
-            FROM session_stats
-            WHERE timestamp > ? AND is_local = 0
-            GROUP BY model
-            ORDER BY SUM(est_cost_usd) DESC, model ASC
-            """,
-            (cutoff,),
-        ).fetchall()
-    return [
-        (model, int(sessions or 0), int(messages or 0), int(tool_calls or 0), float(cost or 0.0))
-        for model, sessions, messages, tool_calls, cost in rows
-    ]
-
-
-def summarize_rows(rows: Iterable[tuple[str, int, int, int, float]], days: int = 30) -> dict:
-    rows = list(rows)
-    agents: dict[str, dict] = {}
-    providers_seen: set[str] = set()
-    inventory = [
-        {
-            "agent": lane["agent"],
-            "provider": lane["provider"],
-            "notes": lane["notes"],
-        }
-        for lane in AGENT_LANES
-    ]
-
-    for lane in AGENT_LANES:
-        agents[lane["agent"]] = {
-            "provider": lane["provider"],
-            "models": [],
-            "sessions": 0,
-            "messages": 0,
-            "tool_calls": 0,
-            "monthly_cost_usd": 0.0,
-            "daily_cost_usd": 0.0,
-            "notes": lane["notes"],
-        }
-
-    unassigned = {
-        "provider": "Unassigned",
-        "models": [],
-        "sessions": 0,
-        "messages": 0,
-        "tool_calls": 0,
-        "monthly_cost_usd": 0.0,
-        "daily_cost_usd": 0.0,
-        "notes": "Observed paid-model spend not yet mapped to a named wizard house.",
-    }
-
-    for model, sessions, messages, tool_calls, monthly_cost in rows:
-        lane = match_lane(model)
-        if lane is None:
-            bucket = unassigned
-        else:
-            bucket = agents[lane["agent"]]
-            providers_seen.add(lane["provider"])
-        bucket["models"].append(
-            {
-                "model": model,
-                "sessions": sessions,
-                "messages": messages,
-                "tool_calls": tool_calls,
-                "monthly_cost_usd": round(monthly_cost, 4),
-            }
-        )
-        bucket["sessions"] += sessions
-        bucket["messages"] += messages
-        bucket["tool_calls"] += tool_calls
-        bucket["monthly_cost_usd"] += monthly_cost
-
-    for bucket in list(agents.values()) + [unassigned]:
-        bucket["monthly_cost_usd"] = round(bucket["monthly_cost_usd"], 4)
-        bucket["daily_cost_usd"] = round(bucket["monthly_cost_usd"] / max(days, 1), 4)
-
-    if unassigned["models"]:
-        agents["Unassigned"] = unassigned
-        providers_seen.add("Unassigned")
-
-    total_monthly = round(sum(item["monthly_cost_usd"] for item in agents.values()), 4)
-    total_daily = round(sum(item["daily_cost_usd"] for item in agents.values()), 4)
-
-    provider_order = sorted(providers_seen)
-    if "Unassigned" in provider_order:
-        provider_order = [p for p in provider_order if p != "Unassigned"] + ["Unassigned"]
-
-    return {
-        "days": days,
-        "providers": provider_order,
-        "inventory": inventory,
-        "agents": agents,
-        "total_monthly_cost_usd": total_monthly,
-        "total_daily_cost_usd": total_daily,
-    }
-
-
-def render_markdown(summary: dict, report_date: str | None = None) -> str:
-    if report_date is None:
-        report_date = datetime.now().strftime("%Y-%m-%d")
-    lines = [
-        f"# Fleet Cost Report — {report_date}",
-        "",
-        f"Window: last {summary['days']} days of paid-model session stats from `~/.timmy/metrics/model_metrics.db`.",
-        "",
-        "## Paid API inventory",
-        "",
-        "| Agent | Provider | Notes |",
-        "| --- | --- | --- |",
-    ]
-    for item in summary["inventory"]:
-        lines.append(f"| {item['agent']} | {item['provider']} | {item['notes']} |")
-
-    lines.extend(
-        [
-            "",
-            "## Estimated cost per agent per day",
-            "",
-            "| Agent | Provider | Daily cost | Monthly estimate | Sessions | Messages | Tool calls |",
-            "| --- | --- | ---: | ---: | ---: | ---: | ---: |",
-        ]
-    )
-    for agent, data in summary["agents"].items():
-        lines.append(
-            f"| {agent} | {data['provider']} | ${data['daily_cost_usd']:.2f} | ${data['monthly_cost_usd']:.2f} | {data['sessions']} | {data['messages']} | {data['tool_calls']} |"
-        )
-
-    lines.extend(
-        [
-            "",
-            f"Total estimated daily paid spend: ${summary['total_daily_cost_usd']:.2f}",
-            f"Total estimated monthly paid spend: ${summary['total_monthly_cost_usd']:.2f}",
-            "",
-            "## Model evidence",
-            "",
-        ]
-    )
-    for agent, data in summary["agents"].items():
-        lines.append(f"### {agent}")
-        if not data["models"]:
-            lines.append("- No paid-model sessions observed in the selected window.")
-        else:
-            for model in data["models"]:
-                lines.append(
-                    f"- `{model['model']}` — {model['sessions']} sessions / {model['messages']} messages / {model['tool_calls']} tool calls / ${model['monthly_cost_usd']:.2f} est."
-                )
-        lines.append("")
-
-    lines.append("Generated by `python3 scripts/fleet_cost_report.py --days 30`. Default output path targets the local timmy-config report lane.")
-    lines.append("")
-    return "\n".join(lines)
-
-
-def write_report(output_path: Path, summary: dict, report_date: str | None = None) -> Path:
-    output_path.parent.mkdir(parents=True, exist_ok=True)
-    output_path.write_text(render_markdown(summary, report_date=report_date), encoding="utf-8")
-    return output_path
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser(description="Estimate paid API spend per fleet agent")
-    parser.add_argument("--days", type=int, default=30, help="Lookback window in days")
-    parser.add_argument("--db-path", default=str(DB_PATH), help="Path to model_metrics.db")
-    parser.add_argument("--output", help="Optional markdown output path")
-    parser.add_argument("--date", help="Override report date (YYYY-MM-DD)")
-    args = parser.parse_args()
-
-    rows = load_cost_rows(days=args.days, db_path=Path(args.db_path).expanduser())
-    summary = summarize_rows(rows, days=args.days)
-    report_date = args.date or datetime.now().strftime("%Y-%m-%d")
-    output_path = Path(args.output).expanduser() if args.output else default_report_path(report_date)
-    write_report(output_path, summary, report_date=report_date)
-    print(output_path)
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

tests/test_fleet_cost_report.py

@@ -1,77 +0,0 @@
-from importlib.util import module_from_spec, spec_from_file_location
-from pathlib import Path
-import tempfile
-import unittest
-
-
-ROOT = Path(__file__).resolve().parent.parent
-SCRIPT_PATH = ROOT / "scripts" / "fleet_cost_report.py"
-
-
-def load_module():
-    spec = spec_from_file_location("fleet_cost_report", SCRIPT_PATH)
-    module = module_from_spec(spec)
-    assert spec.loader is not None
-    spec.loader.exec_module(module)
-    return module
-
-
-class TestFleetCostReport(unittest.TestCase):
-    def test_default_output_targets_timmy_config_report_path(self):
-        module = load_module()
-        output_path = module.default_report_path("2026-04-22")
-        self.assertIn("timmy-config", str(output_path))
-        self.assertTrue(str(output_path).endswith("2026-04-22-fleet-cost-report.md"))
-
-    def test_summary_groups_paid_costs_by_agent_and_provider(self):
-        module = load_module()
-        rows = [
-            ("claude-sonnet-4-6", 12, 120, 24, 6.0),
-            ("gpt-5.4", 6, 60, 12, 3.0),
-            ("openrouter/google/gemini-2.5-pro", 4, 40, 8, 2.0),
-            ("kimi-k2", 2, 20, 4, 1.0),
-        ]
-        summary = module.summarize_rows(rows, days=30)
-
-        self.assertEqual(summary["providers"], ["Anthropic", "Kimi / Moonshot", "OpenAI", "OpenRouter"])
-        self.assertAlmostEqual(summary["agents"]["Ezra"]["monthly_cost_usd"], 6.0)
-        self.assertAlmostEqual(summary["agents"]["Bezalel"]["monthly_cost_usd"], 3.0)
-        self.assertAlmostEqual(summary["agents"]["Timmy Cloud Lane"]["monthly_cost_usd"], 2.0)
-        self.assertAlmostEqual(summary["agents"]["Allegro"]["monthly_cost_usd"], 1.0)
-        self.assertAlmostEqual(summary["agents"]["Ezra"]["daily_cost_usd"], 0.2)
-
-    def test_report_render_mentions_inventory_and_agent_costs(self):
-        module = load_module()
-        rows = [
-            ("claude-sonnet-4-6", 12, 120, 24, 6.0),
-            ("gpt-5.4", 6, 60, 12, 3.0),
-            ("openrouter/google/gemini-2.5-pro", 4, 40, 8, 2.0),
-        ]
-        summary = module.summarize_rows(rows, days=30)
-        report = module.render_markdown(summary, report_date="2026-04-22")
-
-        self.assertIn("# Fleet Cost Report — 2026-04-22", report)
-        self.assertIn("## Paid API inventory", report)
-        self.assertIn("Anthropic", report)
-        self.assertIn("OpenRouter", report)
-        self.assertIn("OpenAI", report)
-        self.assertIn("## Estimated cost per agent per day", report)
-        self.assertIn("Timmy Cloud Lane", report)
-        self.assertIn("Ezra", report)
-        self.assertIn("Bezalel", report)
-
-    def test_write_report_creates_markdown_file(self):
-        module = load_module()
-        rows = [("claude-sonnet-4-6", 1, 10, 2, 0.5)]
-        summary = module.summarize_rows(rows, days=30)
-        with tempfile.TemporaryDirectory() as tmpdir:
-            dest = Path(tmpdir) / "fleet-cost.md"
-            module.write_report(dest, summary, report_date="2026-04-22")
-            self.assertTrue(dest.exists())
-            text = dest.read_text()
-            self.assertIn("Fleet Cost Report", text)
-            self.assertIn("Ezra", text)
-
-
-if __name__ == "__main__":
-    unittest.main()

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"]