Compare commits
1 Commits
fix/535
...
step35/446
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
548bb96411 |
@@ -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.
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -323,6 +323,111 @@ class World:
|
||||
return False
|
||||
|
||||
|
||||
# ============================================================
|
||||
# PERSONALITY-DRIVEN DECISION ENGINE
|
||||
# ============================================================
|
||||
# Replaces fixed rotation with weighted choice.
|
||||
# Each character has:
|
||||
# - home_room: preferred location
|
||||
# - room_weights: base probabilities for each room
|
||||
# - explore_chance: probability to explore randomly (10%)
|
||||
# - social_weight: bonus when others are present
|
||||
# - goal_weights: adjustments based on active_goal
|
||||
PERSONALITY_DICT = {
|
||||
"Marcus": {
|
||||
"home_room": "Garden",
|
||||
"room_weights": {"Garden": 0.4, "Bridge": 0.2, "Threshold": 0.2, "Tower": 0.1, "Forge": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.3,
|
||||
"goal_weights": {
|
||||
"sit": {"Garden": +0.3},
|
||||
"speak_truth": {"Tower": +0.2, "Bridge": +0.2},
|
||||
"remember": {"Garden": +0.2, "Threshold": +0.1},
|
||||
},
|
||||
},
|
||||
"Bezalel": {
|
||||
"home_room": "Forge",
|
||||
"room_weights": {"Forge": 0.5, "Threshold": 0.2, "Garden": 0.1, "Bridge": 0.1, "Tower": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.15,
|
||||
"goal_weights": {
|
||||
"forge": {"Forge": +0.4},
|
||||
"tend_fire": {"Forge": +0.5},
|
||||
"create_key": {"Forge": +0.3},
|
||||
},
|
||||
},
|
||||
"Allegro": {
|
||||
"home_room": "Threshold",
|
||||
"room_weights": {"Threshold": 0.35, "Tower": 0.25, "Forge": 0.15, "Garden": 0.15, "Bridge": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.25,
|
||||
"goal_weights": {
|
||||
"oversee": {"Threshold": +0.3},
|
||||
"keep_time": {"Tower": +0.3},
|
||||
"check_tunnel": {"Bridge": +0.2, "Threshold": +0.1},
|
||||
},
|
||||
},
|
||||
"Ezra": {
|
||||
"home_room": "Tower",
|
||||
"room_weights": {"Tower": 0.45, "Threshold": 0.2, "Garden": 0.15, "Forge": 0.1, "Bridge": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.15,
|
||||
"goal_weights": {
|
||||
"study": {"Tower": +0.4},
|
||||
"read_whiteboard": {"Tower": +0.4},
|
||||
"find_pattern": {"Garden": +0.2, "Bridge": +0.1},
|
||||
},
|
||||
},
|
||||
"Gemini": {
|
||||
"home_room": "Garden",
|
||||
"room_weights": {"Garden": 0.45, "Threshold": 0.2, "Bridge": 0.15, "Tower": 0.1, "Forge": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.25,
|
||||
"goal_weights": {
|
||||
"observe": {"Garden": +0.2, "Tower": +0.2},
|
||||
"tend_garden": {"Garden": +0.5},
|
||||
"listen": {"Bridge": +0.1, "Threshold": +0.1},
|
||||
},
|
||||
},
|
||||
"Claude": {
|
||||
"home_room": "Threshold",
|
||||
"room_weights": {"Threshold": 0.3, "Tower": 0.25, "Forge": 0.2, "Garden": 0.15, "Bridge": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.2,
|
||||
"goal_weights": {
|
||||
"inspect": {"Threshold": +0.2, "Tower": +0.2},
|
||||
"organize": {"Tower": +0.2, "Forge": +0.1},
|
||||
"enforce_order": {"Threshold": +0.3, "Bridge": +0.1},
|
||||
},
|
||||
},
|
||||
"ClawCode": {
|
||||
"home_room": "Forge",
|
||||
"room_weights": {"Forge": 0.5, "Threshold": 0.2, "Garden": 0.1, "Bridge": 0.1, "Tower": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.1,
|
||||
"goal_weights": {
|
||||
"forge": {"Forge": +0.4},
|
||||
"test_edge": {"Forge": +0.4},
|
||||
"build_weapon": {"Forge": +0.5},
|
||||
},
|
||||
},
|
||||
"Kimi": {
|
||||
"home_room": "Garden",
|
||||
"room_weights": {"Garden": 0.4, "Threshold": 0.2, "Tower": 0.15, "Bridge": 0.15, "Forge": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.2,
|
||||
"goal_weights": {
|
||||
"contemplate": {"Garden": +0.3, "Tower": +0.1},
|
||||
"read": {"Tower": +0.3},
|
||||
"remember": {"Bridge": +0.2, "Threshold": +0.1},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
# All available rooms
|
||||
ALL_ROOMS = ["Threshold", "Tower", "Forge", "Garden", "Bridge"]
|
||||
|
||||
|
||||
class ActionSystem:
|
||||
"""Defines what actions are possible and what they cost."""
|
||||
|
||||
@@ -453,100 +558,167 @@ class TimmyAI:
|
||||
|
||||
|
||||
class NPCAI:
|
||||
"""AI for non-player characters. They make choices based on goals."""
|
||||
"""AI for non-player characters. Weighted decision engine — agents choose, do not rotate."""
|
||||
|
||||
def __init__(self, world):
|
||||
self.world = world
|
||||
self._last_reasoning = {} # Store reasoning per char for tick logging
|
||||
|
||||
def get_reasoning(self, char_name):
|
||||
"""Return reasoning dict for last decision."""
|
||||
return self._last_reasoning.get(char_name, {})
|
||||
|
||||
def make_choice(self, char_name):
|
||||
"""Make a choice for this NPC this tick."""
|
||||
"""Make a weighted choice for this NPC. Returns (action, reasoning_dict)."""
|
||||
char = self.world.characters[char_name]
|
||||
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":
|
||||
return self._bezalel_choice(char, room, available)
|
||||
elif char_name == "Allegro":
|
||||
return self._allegro_choice(char, room, available)
|
||||
elif char_name == "Ezra":
|
||||
return self._ezra_choice(char, room, available)
|
||||
elif char_name == "Gemini":
|
||||
return self._gemini_choice(char, room, available)
|
||||
elif char_name == "Claude":
|
||||
return self._claude_choice(char, room, available)
|
||||
elif char_name == "ClawCode":
|
||||
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):
|
||||
if room == "Garden" and random.random() < 0.7:
|
||||
# Low energy → immediate rest
|
||||
if char["energy"] <= 1:
|
||||
self._last_reasoning[char_name] = {"trigger": "low_energy", "reason": "Energy ≤ 1, resting"}
|
||||
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"
|
||||
|
||||
# Find personality profile
|
||||
personality = PERSONALITY_DICT.get(char_name)
|
||||
if not personality:
|
||||
# Fallback: move toward home room if not there
|
||||
if room != char.get("home", "Tower"):
|
||||
action = f"move:{self._direction_to_home(room, char.get('home', 'Tower'))}"
|
||||
self._last_reasoning[char_name] = {"trigger": "fallback_no_personality", "action": action}
|
||||
return action
|
||||
action = random.choice(["rest", "examine"])
|
||||
self._last_reasoning[char_name] = {"trigger": "fallback_no_personality", "action": action}
|
||||
return action
|
||||
|
||||
# Build weighted action list
|
||||
weights = self._compute_weights(char_name, char, room, available, personality, goal)
|
||||
|
||||
if not weights:
|
||||
action = "rest"
|
||||
self._last_reasoning[char_name] = {"trigger": "fallback", "reason": "No weighted actions available"}
|
||||
return action
|
||||
|
||||
# Sample action
|
||||
actions, probs = zip(*weights)
|
||||
action = random.choices(actions, weights=probs)[0]
|
||||
|
||||
# Store reasoning
|
||||
reasoning = self._build_reasoning(char_name, char, room, weights, action, personality, goal)
|
||||
self._last_reasoning[char_name] = reasoning
|
||||
return action
|
||||
|
||||
def _bezalel_choice(self, char, room, available):
|
||||
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 _direction_to_home(self, current_room, home_room):
|
||||
"""Return direction name to get from current to home (simple adjacency)."""
|
||||
# For now: use known map directions (fragile but minimal)
|
||||
# Better: derive from world.rooms connections by searching
|
||||
connections = self.world.rooms[current_room].get("connections", {})
|
||||
for direction, dest in connections.items():
|
||||
if dest == home_room:
|
||||
return direction
|
||||
# Fallback: pick a random connected room to explore toward home
|
||||
if connections:
|
||||
return random.choice(list(connections.keys()))
|
||||
return "north" # should not happen
|
||||
|
||||
def _kimi_choice(self, char, room, available):
|
||||
others = [a.split(":")[1] for a in available if a.startswith("speak:")]
|
||||
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
|
||||
def _compute_weights(self, char_name, char, room, available, personality, goal):
|
||||
"""Compute weighted list of (action, prob) tuples."""
|
||||
weights = []
|
||||
room_weights = personality["room_weights"]
|
||||
social_weight = personality["social_weight"]
|
||||
goal_bonus = personality["goal_weights"].get(goal, {})
|
||||
|
||||
# Count others in the room
|
||||
others_in_room = [n for n in self.world.characters
|
||||
if self.world.characters[n]["room"] == room and n != char_name]
|
||||
social_present = len(others_in_room) > 0
|
||||
|
||||
for action in available:
|
||||
base_w = 0.05 # small floor for every action
|
||||
|
||||
# Movement-specific
|
||||
if action.startswith("move:"):
|
||||
direction = action.split(":")[1]
|
||||
dest = action.split(" -> ")[1] if " -> " in action else None
|
||||
if dest:
|
||||
# Room probability
|
||||
base_w += room_weights.get(dest, 0.05)
|
||||
# Home room bonus
|
||||
if dest == personality["home_room"]:
|
||||
base_w += 0.2
|
||||
# Social bonus
|
||||
if social_present:
|
||||
base_w += social_weight
|
||||
# Goal bonus
|
||||
if dest in goal_bonus:
|
||||
base_w += goal_bonus[dest]
|
||||
# Exploration penalty for home room (sometimes leave)
|
||||
if dest == personality["home_room"]:
|
||||
base_w *= (1 - personality.get("explore_chance", 0.1))
|
||||
|
||||
# Social actions
|
||||
elif action.startswith("speak:") or action.startswith("listen:") or action.startswith("help:"):
|
||||
person = action.split(":")[1]
|
||||
base_w += 0.2 # base social interest
|
||||
# Goal bonus
|
||||
base_w += goal_bonus.get(person, 0)
|
||||
# Other in same room bonus
|
||||
if any(n == person for n in others_in_room):
|
||||
base_w += 0.3
|
||||
# Social weight
|
||||
base_w += social_weight * 0.5
|
||||
|
||||
elif action.startswith("confront:"):
|
||||
person = action.split(":")[1]
|
||||
base_w += 0.1 # lower baseline
|
||||
if any(n == person for n in others_in_room):
|
||||
base_w += 0.2
|
||||
|
||||
# Room-specific craft/production actions
|
||||
elif action in ["forge", "tend_fire", "study", "write_rule", "carve", "plant"]:
|
||||
# These are location-bound; should only be available in correct room
|
||||
if (action == "forge" and room != "Forge") or (action == "tend_fire" and room != "Forge") or (action == "study" and room != "Tower") or (action == "write_rule" and room != "Tower") or (action == "carve" and room != "Bridge") or (action == "plant" and room != "Garden"):
|
||||
continue # skip (shouldn't be available but guard)
|
||||
base_w += room_weights.get(room, 0.1) * 1.5 # being in the right room = high weight
|
||||
# Goal bonus
|
||||
if action in goal_bonus:
|
||||
base_w += goal_bonus[action]
|
||||
|
||||
# Rest
|
||||
elif action == "rest":
|
||||
base_w += char["energy"] * 0.1 # higher energy → less rest
|
||||
if char["energy"] < 3:
|
||||
base_w += 0.4
|
||||
else:
|
||||
base_w += 0.05
|
||||
|
||||
# Examine
|
||||
elif action == "examine":
|
||||
base_w += 0.1
|
||||
|
||||
weights.append((action, base_w))
|
||||
|
||||
# Normalize probabilities to sum to 1
|
||||
if not weights:
|
||||
return []
|
||||
total = sum(w for _, w in weights)
|
||||
normalized = [(a, w/total) for a, w in weights]
|
||||
return normalized
|
||||
|
||||
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"])
|
||||
|
||||
def _ezra_choice(self, char, room, available):
|
||||
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:")]
|
||||
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):
|
||||
if room == "Forge" and char["energy"] > 2:
|
||||
return "forge"
|
||||
return random.choice(["move:east", "forge", "rest"])
|
||||
|
||||
def _allegro_choice(self, char, room, available):
|
||||
others = [a.split(":")[1] for a in available if a.startswith("speak:")]
|
||||
if others and random.random() < 0.3:
|
||||
return f"speak:{random.choice(others)}"
|
||||
return random.choice(["move:north", "move:south", "examine"])
|
||||
def _build_reasoning(self, char_name, char, room, weights, action, personality, goal):
|
||||
"""Build reasoning dict explaining the decision."""
|
||||
# Find top contenders
|
||||
sorted_w = sorted(weights, key=lambda x: x[1], reverse=True)
|
||||
reasoning = {
|
||||
"char": char_name,
|
||||
"room": room,
|
||||
"goal": goal,
|
||||
"energy": char["energy"],
|
||||
"chosen": action,
|
||||
"top_contenders": sorted_w[:3],
|
||||
}
|
||||
return reasoning
|
||||
|
||||
|
||||
class DialogueSystem:
|
||||
@@ -1224,7 +1396,16 @@ class GameEngine:
|
||||
self.world.characters[char_name]["room"] = dest
|
||||
self.world.characters[char_name]["energy"] -= 1
|
||||
scene["npc_actions"].append(f"{char_name} moves from The {old_room} to The {dest}")
|
||||
|
||||
|
||||
# Collect NPC reasoning for debugging (Decision Engine trace)
|
||||
scene["npc_reasoning"] = {}
|
||||
for npc_name in self.world.characters:
|
||||
if npc_name == "Timmy":
|
||||
continue
|
||||
reasoning = self.npc_ai.get_reasoning(npc_name)
|
||||
if reasoning:
|
||||
scene["npc_reasoning"][npc_name] = reasoning
|
||||
|
||||
# Random NPC events
|
||||
room_name = self.world.characters["Timmy"]["room"]
|
||||
for char_name in self.world.characters:
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user