feat: harden Bezalel tailscale bootstrap packet (#535)

docs/BEZALEL_TAILSCALE_BOOTSTRAP.md

@@ -0,0 +1,96 @@
+# 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,6 +14,7 @@ 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)
 

docs/UNIFIED_FLEET_SOVEREIGNTY_STATUS.md

@@ -1,107 +0,0 @@
-# [DIRECTIVE] Unified Fleet Sovereignty & Comms Migration
-
-Grounding report for `timmy-home #524`.
-
-Issue #524 is a multi-lane directive, not a one-commit feature. This report grounds the directive in repo evidence, highlights stale cross-links, and names the missing operator bundles that still need real execution.
-
-This remains a `Refs #524` artifact. The directive spans multiple repos and operator actions, so this report makes the current repo-side state executable without pretending the whole migration is complete.
-
-## Directive Snapshot
-
-- Repo-grounded workstreams: 0
-- Partial workstreams: 4
-- Missing workstreams: 1
-- Drifted references: 4
-
-## Reference Drift
-
-- #813 is cited for Nostr Migration Leadership, but its current title is 'docs: refresh the-playground genome analysis (#671)'.
-- #819 is cited for Nostr Migration Leadership, but its current title is 'docs: verify #648 already implemented (closes #818)'.
-- #139 is cited for v0.7.0 Feature Audit, but its current title is '🐣 Allegro-Primus is born'.
-- #103 is cited for Morrowind Local-First Benchmark, but its current title is 'Build comprehensive caching layer — cache everywhere'.
-
-## Workstream Matrix
-
-### 1. Nostr Migration Leadership — PARTIAL
-
-- Requirement: Replace Telegram with relay-based sovereign comms, verify wizard keypairs, and prove the NIP-29 group path is stable.
-- Referenced issues:
-  - #813 (closed) — docs: refresh the-playground genome analysis (#671) [DRIFT]
-  - #819 (open) — docs: verify #648 already implemented (closes #818) [DRIFT]
-- Repo evidence present:
-  - `infrastructure/timmy-bridge/client/timmy_client.py` — Nostr event client scaffold already exists
-  - `infrastructure/timmy-bridge/monitor/timmy_monitor.py` — Nostr relay monitor already exists
-  - `specs/wizard-telegram-bot-cutover.md` — Telegram cutover planning exists, so the migration lane is real
-- Missing operator deliverables:
-  - wizard keypair inventory and ownership matrix
-  - NIP-29 relay group verification report
-  - operator runbook for cutting traffic off Telegram
-- Why this lane remains open: The repo has Nostr-adjacent scaffolding, but the directive still lacks a verified migration packet and the cited issue links drift away from the stated Nostr scope.
-
-### 2. Lexicon Enforcement — PARTIAL
-
-- Requirement: Enforce the Fleet Lexicon in PR review and issue triage so the team uses one shared language.
-- Referenced issues:
-  - #388 (closed) — [KT] Fleet Lexicon & Techniques — Shared Vocabulary, Patterns, and Standards for All Agents [aligned]
-- Repo evidence present:
-  - `docs/WIZARD_APPRENTICESHIP_CHARTER.md` — The repo already uses wizard-language canon in docs
-  - `specs/timmy-ezra-bezalel-canon-sheet.md` — Canonical agent naming already exists
-  - `docs/OPERATIONS_DASHBOARD.md` — Operational roles are already described in repo language
-- Missing operator deliverables:
-  - machine-checkable lexicon policy for review/triage
-  - terminology lint or reviewer checklist tied to the lexicon
-- Why this lane remains open: The naming canon exists, but there is still no executable enforcement bundle that would catch drift during future reviews and triage passes.
-
-### 3. v0.7.0 Feature Audit — PARTIAL
-
-- Requirement: Audit Hermes features that can reduce cloud dependency and turn the findings into a sovereignty implementation plan.
-- Referenced issues:
-  - #139 (open) — 🐣 Allegro-Primus is born [DRIFT]
-- Repo evidence present:
-  - `scripts/sovereignty_audit.py` — Cloud-vs-local audit machinery already exists
-  - `reports/evaluations/2026-04-15-phase-4-sovereignty-audit.md` — Recent sovereignty audit report is committed
-  - `timmy-local/README.md` — Local-first status is already documented for operators
-- Missing operator deliverables:
-  - Hermes v0.7.0 feature inventory linked to cloud-reduction leverage
-  - Sovereignty Implementation Plan derived from that feature audit
-- Why this lane remains open: The repo has sovereignty-audit infrastructure, but it does not yet contain the requested v0.7.0 feature inventory or the plan that turns those findings into rollout steps.
-
-### 4. Morrowind Local-First Benchmark — PARTIAL
-
-- Requirement: Compare cloud and local Morrowind agents, prove local parity where possible, and document the reasoning gap when it fails.
-- Referenced issues:
-  - #103 (open) — Build comprehensive caching layer — cache everywhere [DRIFT]
-- Repo evidence present:
-  - `morrowind/local_brain.py` — Local Morrowind control loop already exists
-  - `morrowind/mcp_server.py` — Morrowind MCP control surface is already wired
-  - `morrowind/pilot.py` — Trajectory logging for evaluation already exists
-- Missing operator deliverables:
-  - cloud-vs-local benchmark report for the combat loop
-  - reasoning-gap writeup tied to a proposed LoRA/fine-tune path
-- Why this lane remains open: The repo has a local Morrowind stack, but it does not yet contain the requested benchmark artifact; the cited issue number also points at an unrelated caching task.
-
-### 5. Infrastructure Hardening / Syntax Guard — MISSING
-
-- Requirement: Verify Syntax Guard pre-receive protection across Gitea repos so syntax failures stop earlier.
-- Referenced issues: none listed in the directive body
-- Repo evidence present: none
-- Missing operator deliverables:
-  - repo inventory of Gitea targets that should carry Syntax Guard
-  - deployment verifier for hook presence across those repos
-  - operator report proving installation state instead of assuming it
-- Why this lane remains open: No repo-managed syntax-guard verifier is present yet, so this directive still depends on manual trust rather than auditable proof.
-
-## Highest-Leverage Next Actions
-
-- Nostr Migration Leadership: wizard keypair inventory and ownership matrix
-- Lexicon Enforcement: machine-checkable lexicon policy for review/triage
-- v0.7.0 Feature Audit: Hermes v0.7.0 feature inventory linked to cloud-reduction leverage
-- Morrowind Local-First Benchmark: cloud-vs-local benchmark report for the combat loop
-- Infrastructure Hardening / Syntax Guard: repo inventory of Gitea targets that should carry Syntax Guard
-
-## Why #524 Remains Open
-
-- The directive bundles five separate workstreams with different evidence surfaces.
-- Multiple cited issue numbers have drifted away from the work they are supposed to anchor.
-- Repo scaffolding exists for Nostr, sovereignty audits, and Morrowind, but the operator-facing bundles are still missing.
-- Syntax Guard verification is still undocumented and unproven inside this repo.

scripts/bezalel_tailscale_bootstrap.py

@@ -16,11 +16,14 @@ import argparse
 import json
 import shlex
 import subprocess
+import re
+from json import JSONDecoder
 from pathlib import Path
 from typing import Any
 
-DEFAULT_HOST = "159.203.146.185"
+DEFAULT_HOST = "67.205.155.108"
 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",
@@ -66,6 +69,37 @@ 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)}"]
 
@@ -89,8 +123,9 @@ 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", default=DEFAULT_HOST)
+    parser.add_argument("--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")
@@ -116,6 +151,7 @@ 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.")
@@ -126,28 +162,31 @@ def main() -> None:
     write_script(args.script_out, script)
 
     payload: dict[str, Any] = {
-        "host": args.host,
+        "host": resolved_host,
+        "host_source": host_source,
         "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(args.host, args.remote_script_path),
+        "ssh_command": build_ssh_command(resolved_host, args.remote_script_path),
         "peer_targets": peers,
         "applied": False,
     }
 
     if args.apply:
-        result = run_remote(args.host, args.remote_script_path)
+        result = run_remote(resolved_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: {args.host}")
+    print(f"Host: {resolved_host} ({host_source})")
     print(f"Local script: {args.script_out}")
     print("SSH command: " + " ".join(payload["ssh_command"]))
     if args.apply:

scripts/unified_fleet_sovereignty_status.py

@@ -1,418 +0,0 @@
-#!/usr/bin/env python3
-"""Ground timmy-home #524 as an executable status report.
-
-Refs: timmy-home #524
-"""
-
-from __future__ import annotations
-
-import argparse
-import json
-from copy import deepcopy
-from pathlib import Path
-from typing import Any
-from urllib import request
-
-DEFAULT_BASE_URL = "https://forge.alexanderwhitestone.com/api/v1"
-DEFAULT_OWNER = "Timmy_Foundation"
-DEFAULT_REPO = "timmy-home"
-DEFAULT_TOKEN_FILE = Path.home() / ".config" / "gitea" / "token"
-DEFAULT_REPO_ROOT = Path(__file__).resolve().parents[1]
-DEFAULT_DOC_PATH = DEFAULT_REPO_ROOT / "docs" / "UNIFIED_FLEET_SOVEREIGNTY_STATUS.md"
-
-DIRECTIVE_TITLE = "[DIRECTIVE] Unified Fleet Sovereignty & Comms Migration"
-DIRECTIVE_SUMMARY = (
-    "Issue #524 is a multi-lane directive, not a one-commit feature. "
-    "This report grounds the directive in repo evidence, highlights stale cross-links, "
-    "and names the missing operator bundles that still need real execution."
-)
-
-DEFAULT_REFERENCE_SNAPSHOT = {
-    388: {
-        "title": "[KT] Fleet Lexicon & Techniques — Shared Vocabulary, Patterns, and Standards for All Agents",
-        "state": "closed",
-    },
-    103: {
-        "title": "Build comprehensive caching layer — cache everywhere",
-        "state": "open",
-    },
-    139: {
-        "title": "🐣 Allegro-Primus is born",
-        "state": "open",
-    },
-    813: {
-        "title": "docs: refresh the-playground genome analysis (#671)",
-        "state": "closed",
-    },
-    819: {
-        "title": "docs: verify #648 already implemented (closes #818)",
-        "state": "open",
-    },
-}
-
-WORKSTREAMS = [
-    {
-        "key": "nostr-migration",
-        "name": "Nostr Migration Leadership",
-        "requirement": "Replace Telegram with relay-based sovereign comms, verify wizard keypairs, and prove the NIP-29 group path is stable.",
-        "references": [813, 819],
-        "expected_keywords": ["nostr", "relay", "telegram", "comms", "messenger"],
-        "repo_evidence": [
-            {
-                "path": "infrastructure/timmy-bridge/client/timmy_client.py",
-                "description": "Nostr event client scaffold already exists",
-            },
-            {
-                "path": "infrastructure/timmy-bridge/monitor/timmy_monitor.py",
-                "description": "Nostr relay monitor already exists",
-            },
-            {
-                "path": "specs/wizard-telegram-bot-cutover.md",
-                "description": "Telegram cutover planning exists, so the migration lane is real",
-            },
-        ],
-        "missing_deliverables": [
-            "wizard keypair inventory and ownership matrix",
-            "NIP-29 relay group verification report",
-            "operator runbook for cutting traffic off Telegram",
-        ],
-        "why_open": "The repo has Nostr-adjacent scaffolding, but the directive still lacks a verified migration packet and the cited issue links drift away from the stated Nostr scope.",
-    },
-    {
-        "key": "lexicon-enforcement",
-        "name": "Lexicon Enforcement",
-        "requirement": "Enforce the Fleet Lexicon in PR review and issue triage so the team uses one shared language.",
-        "references": [388],
-        "expected_keywords": ["lexicon", "vocabulary", "standards", "shared vocabulary"],
-        "repo_evidence": [
-            {
-                "path": "docs/WIZARD_APPRENTICESHIP_CHARTER.md",
-                "description": "The repo already uses wizard-language canon in docs",
-            },
-            {
-                "path": "specs/timmy-ezra-bezalel-canon-sheet.md",
-                "description": "Canonical agent naming already exists",
-            },
-            {
-                "path": "docs/OPERATIONS_DASHBOARD.md",
-                "description": "Operational roles are already described in repo language",
-            },
-        ],
-        "missing_deliverables": [
-            "machine-checkable lexicon policy for review/triage",
-            "terminology lint or reviewer checklist tied to the lexicon",
-        ],
-        "why_open": "The naming canon exists, but there is still no executable enforcement bundle that would catch drift during future reviews and triage passes.",
-    },
-    {
-        "key": "feature-audit",
-        "name": "v0.7.0 Feature Audit",
-        "requirement": "Audit Hermes features that can reduce cloud dependency and turn the findings into a sovereignty implementation plan.",
-        "references": [139],
-        "expected_keywords": ["hermes", "feature", "audit", "v0.7.0", "sovereignty"],
-        "repo_evidence": [
-            {
-                "path": "scripts/sovereignty_audit.py",
-                "description": "Cloud-vs-local audit machinery already exists",
-            },
-            {
-                "path": "reports/evaluations/2026-04-15-phase-4-sovereignty-audit.md",
-                "description": "Recent sovereignty audit report is committed",
-            },
-            {
-                "path": "timmy-local/README.md",
-                "description": "Local-first status is already documented for operators",
-            },
-        ],
-        "missing_deliverables": [
-            "Hermes v0.7.0 feature inventory linked to cloud-reduction leverage",
-            "Sovereignty Implementation Plan derived from that feature audit",
-        ],
-        "why_open": "The repo has sovereignty-audit infrastructure, but it does not yet contain the requested v0.7.0 feature inventory or the plan that turns those findings into rollout steps.",
-    },
-    {
-        "key": "morrowind-benchmark",
-        "name": "Morrowind Local-First Benchmark",
-        "requirement": "Compare cloud and local Morrowind agents, prove local parity where possible, and document the reasoning gap when it fails.",
-        "references": [103],
-        "expected_keywords": ["morrowind", "combat", "benchmark", "local", "cloud"],
-        "repo_evidence": [
-            {
-                "path": "morrowind/local_brain.py",
-                "description": "Local Morrowind control loop already exists",
-            },
-            {
-                "path": "morrowind/mcp_server.py",
-                "description": "Morrowind MCP control surface is already wired",
-            },
-            {
-                "path": "morrowind/pilot.py",
-                "description": "Trajectory logging for evaluation already exists",
-            },
-        ],
-        "missing_deliverables": [
-            "cloud-vs-local benchmark report for the combat loop",
-            "reasoning-gap writeup tied to a proposed LoRA/fine-tune path",
-        ],
-        "why_open": "The repo has a local Morrowind stack, but it does not yet contain the requested benchmark artifact; the cited issue number also points at an unrelated caching task.",
-    },
-    {
-        "key": "syntax-guard",
-        "name": "Infrastructure Hardening / Syntax Guard",
-        "requirement": "Verify Syntax Guard pre-receive protection across Gitea repos so syntax failures stop earlier.",
-        "references": [],
-        "expected_keywords": [],
-        "repo_evidence": [],
-        "missing_deliverables": [
-            "repo inventory of Gitea targets that should carry Syntax Guard",
-            "deployment verifier for hook presence across those repos",
-            "operator report proving installation state instead of assuming it",
-        ],
-        "why_open": "No repo-managed syntax-guard verifier is present yet, so this directive still depends on manual trust rather than auditable proof.",
-    },
-]
-
-
-def default_snapshot() -> dict[int, dict[str, str]]:
-    return deepcopy(DEFAULT_REFERENCE_SNAPSHOT)
-
-
-class GiteaClient:
-    def __init__(self, token: str, owner: str = DEFAULT_OWNER, repo: str = DEFAULT_REPO, base_url: str = DEFAULT_BASE_URL):
-        self.token = token
-        self.owner = owner
-        self.repo = repo
-        self.base_url = base_url.rstrip("/")
-
-    def get_issue(self, issue_number: int) -> dict[str, Any]:
-        req = request.Request(
-            f"{self.base_url}/repos/{self.owner}/{self.repo}/issues/{issue_number}",
-            headers={"Authorization": f"token {self.token}", "Accept": "application/json"},
-        )
-        with request.urlopen(req, timeout=30) as resp:
-            return json.loads(resp.read().decode())
-
-
-def load_snapshot(path: Path | None = None) -> dict[int, dict[str, str]]:
-    if path is None:
-        return default_snapshot()
-    data = json.loads(path.read_text(encoding="utf-8"))
-    return {int(k): v for k, v in data.items()}
-
-
-def refresh_snapshot(token_file: Path = DEFAULT_TOKEN_FILE) -> dict[int, dict[str, str]]:
-    token = token_file.read_text(encoding="utf-8").strip()
-    client = GiteaClient(token=token)
-    snapshot: dict[int, dict[str, str]] = {}
-    for issue_number in sorted(DEFAULT_REFERENCE_SNAPSHOT):
-        issue = client.get_issue(issue_number)
-        snapshot[issue_number] = {
-            "title": issue["title"],
-            "state": issue["state"],
-        }
-    return snapshot
-
-
-def collect_repo_evidence(entries: list[dict[str, str]], repo_root: Path) -> tuple[list[str], list[str]]:
-    present: list[str] = []
-    missing: list[str] = []
-    for entry in entries:
-        label = f"`{entry['path']}` — {entry['description']}"
-        if (repo_root / entry["path"]).exists():
-            present.append(label)
-        else:
-            missing.append(label)
-    return present, missing
-
-
-
-def evaluate_reference(issue_number: int, snapshot: dict[int, dict[str, str]], expected_keywords: list[str]) -> dict[str, Any]:
-    record = snapshot.get(issue_number, {"title": "missing from snapshot", "state": "unknown"})
-    title = record["title"]
-    title_lower = title.lower()
-    matched_keywords = [kw for kw in expected_keywords if kw.lower() in title_lower]
-    aligned = bool(matched_keywords) if expected_keywords else True
-    return {
-        "number": issue_number,
-        "title": title,
-        "state": record["state"],
-        "aligned": aligned,
-        "matched_keywords": matched_keywords,
-    }
-
-
-
-def classify_workstream(reference_results: list[dict[str, Any]], evidence_present: list[str], missing_deliverables: list[str]) -> str:
-    has_drift = any(not item["aligned"] for item in reference_results)
-    if not evidence_present:
-        return "MISSING"
-    if has_drift or missing_deliverables:
-        return "PARTIAL"
-    return "GROUNDED"
-
-
-
-def evaluate_directive(snapshot: dict[int, dict[str, str]] | None = None, repo_root: Path | None = None) -> dict[str, Any]:
-    snapshot = snapshot or default_snapshot()
-    repo_root = repo_root or DEFAULT_REPO_ROOT
-    workstreams: list[dict[str, Any]] = []
-    drift_items: list[str] = []
-
-    for lane in WORKSTREAMS:
-        reference_results = [
-            evaluate_reference(issue_number, snapshot, lane["expected_keywords"])
-            for issue_number in lane["references"]
-        ]
-        present, missing = collect_repo_evidence(lane["repo_evidence"], repo_root)
-        for item in reference_results:
-            if not item["aligned"]:
-                drift_items.append(
-                    f"#{item['number']} is cited for {lane['name']}, but its current title is '{item['title']}'."
-                )
-        workstream = {
-            "key": lane["key"],
-            "name": lane["name"],
-            "requirement": lane["requirement"],
-            "reference_results": reference_results,
-            "repo_evidence_present": present,
-            "repo_evidence_missing": missing,
-            "missing_deliverables": list(lane["missing_deliverables"]),
-            "why_open": lane["why_open"],
-        }
-        workstream["status"] = classify_workstream(
-            reference_results=reference_results,
-            evidence_present=present,
-            missing_deliverables=workstream["missing_deliverables"],
-        )
-        workstreams.append(workstream)
-
-    next_actions: list[str] = []
-    for workstream in workstreams:
-        if workstream["missing_deliverables"]:
-            next_actions.append(f"{workstream['name']}: {workstream['missing_deliverables'][0]}")
-
-    return {
-        "issue_number": 524,
-        "title": DIRECTIVE_TITLE,
-        "summary": DIRECTIVE_SUMMARY,
-        "reference_snapshot": {str(k): v for k, v in sorted(snapshot.items())},
-        "workstreams": workstreams,
-        "reference_drift": drift_items,
-        "grounded_workstreams": sum(1 for item in workstreams if item["status"] == "GROUNDED"),
-        "partial_workstreams": sum(1 for item in workstreams if item["status"] == "PARTIAL"),
-        "missing_workstreams": sum(1 for item in workstreams if item["status"] == "MISSING"),
-        "next_actions": next_actions,
-    }
-
-
-
-def render_markdown(result: dict[str, Any]) -> str:
-    lines = [
-        f"# {result['title']}",
-        "",
-        "Grounding report for `timmy-home #524`.",
-        "",
-        result["summary"],
-        "",
-        "This remains a `Refs #524` artifact. The directive spans multiple repos and operator actions, so this report makes the current repo-side state executable without pretending the whole migration is complete.",
-        "",
-        "## Directive Snapshot",
-        "",
-        f"- Repo-grounded workstreams: {result['grounded_workstreams']}",
-        f"- Partial workstreams: {result['partial_workstreams']}",
-        f"- Missing workstreams: {result['missing_workstreams']}",
-        f"- Drifted references: {len(result['reference_drift'])}",
-        "",
-        "## Reference Drift",
-        "",
-    ]
-    if result["reference_drift"]:
-        lines.extend(f"- {item}" for item in result["reference_drift"])
-    else:
-        lines.append("- No stale cross-links detected in the directive snapshot.")
-
-    lines.extend(["", "## Workstream Matrix", ""])
-    for index, workstream in enumerate(result["workstreams"], start=1):
-        lines.extend(
-            [
-                f"### {index}. {workstream['name']} — {workstream['status']}",
-                "",
-                f"- Requirement: {workstream['requirement']}",
-            ]
-        )
-        if workstream["reference_results"]:
-            lines.append("- Referenced issues:")
-            for ref in workstream["reference_results"]:
-                alignment = "aligned" if ref["aligned"] else "DRIFT"
-                lines.append(
-                    f"  - #{ref['number']} ({ref['state']}) — {ref['title']} [{alignment}]"
-                )
-        else:
-            lines.append("- Referenced issues: none listed in the directive body")
-
-        if workstream["repo_evidence_present"]:
-            lines.append("- Repo evidence present:")
-            lines.extend(f"  - {item}" for item in workstream["repo_evidence_present"])
-        else:
-            lines.append("- Repo evidence present: none")
-
-        if workstream["repo_evidence_missing"]:
-            lines.append("- Repo evidence expected but missing:")
-            lines.extend(f"  - {item}" for item in workstream["repo_evidence_missing"])
-
-        if workstream["missing_deliverables"]:
-            lines.append("- Missing operator deliverables:")
-            lines.extend(f"  - {item}" for item in workstream["missing_deliverables"])
-        else:
-            lines.append("- Missing operator deliverables: none")
-
-        lines.append(f"- Why this lane remains open: {workstream['why_open']}")
-        lines.append("")
-
-    lines.extend(["## Highest-Leverage Next Actions", ""])
-    lines.extend(f"- {item}" for item in result["next_actions"])
-
-    lines.extend(
-        [
-            "",
-            "## Why #524 Remains Open",
-            "",
-            "- The directive bundles five separate workstreams with different evidence surfaces.",
-            "- Multiple cited issue numbers have drifted away from the work they are supposed to anchor.",
-            "- Repo scaffolding exists for Nostr, sovereignty audits, and Morrowind, but the operator-facing bundles are still missing.",
-            "- Syntax Guard verification is still undocumented and unproven inside this repo.",
-        ]
-    )
-
-    return "\n".join(lines).rstrip() + "\n"
-
-
-
-def main() -> None:
-    parser = argparse.ArgumentParser(description="Render the unified fleet sovereignty status report for issue #524")
-    parser.add_argument("--snapshot", help="Optional JSON snapshot file overriding the default issue-title/state snapshot")
-    parser.add_argument("--live", action="store_true", help="Refresh the issue snapshot from Gitea before rendering")
-    parser.add_argument("--token-file", default=str(DEFAULT_TOKEN_FILE), help="Token file used with --live")
-    parser.add_argument("--output", help="Optional path to write the rendered report")
-    parser.add_argument("--json", action="store_true", help="Print computed JSON instead of markdown")
-    args = parser.parse_args()
-
-    if args.live:
-        snapshot = refresh_snapshot(Path(args.token_file).expanduser())
-    else:
-        snapshot = load_snapshot(Path(args.snapshot).expanduser() if args.snapshot else None)
-
-    result = evaluate_directive(snapshot=snapshot, repo_root=DEFAULT_REPO_ROOT)
-    rendered = json.dumps(result, indent=2) if args.json else render_markdown(result)
-
-    if args.output:
-        output_path = Path(args.output).expanduser()
-        output_path.parent.mkdir(parents=True, exist_ok=True)
-        output_path.write_text(rendered, encoding="utf-8")
-        print(f"Directive status written to {output_path}")
-    else:
-        print(rendered)
-
-
-if __name__ == "__main__":
-    main()

tests/test_bezalel_tailscale_bootstrap.py

@@ -2,9 +2,12 @@ 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():
@@ -78,3 +81,46 @@ 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_unified_fleet_sovereignty_status.py

@@ -1,77 +0,0 @@
-from __future__ import annotations
-
-import importlib.util
-from pathlib import Path
-
-
-ROOT = Path(__file__).resolve().parents[1]
-SCRIPT_PATH = ROOT / "scripts" / "unified_fleet_sovereignty_status.py"
-DOC_PATH = ROOT / "docs" / "UNIFIED_FLEET_SOVEREIGNTY_STATUS.md"
-
-
-def _load_module(path: Path, name: str):
-    assert path.exists(), f"missing {path.relative_to(ROOT)}"
-    spec = importlib.util.spec_from_file_location(name, path)
-    assert spec and spec.loader
-    module = importlib.util.module_from_spec(spec)
-    spec.loader.exec_module(module)
-    return module
-
-
-def _workstream(result: dict, key: str) -> dict:
-    for workstream in result["workstreams"]:
-        if workstream["key"] == key:
-            return workstream
-    raise AssertionError(f"missing workstream {key}")
-
-
-def test_evaluate_directive_flags_reference_drift_without_faking_completion() -> None:
-    mod = _load_module(SCRIPT_PATH, "unified_fleet_sovereignty_status")
-    result = mod.evaluate_directive(snapshot=mod.default_snapshot(), repo_root=ROOT)
-
-    assert len(result["reference_drift"]) == 4
-    assert any("#813" in item for item in result["reference_drift"])
-    assert any("#103" in item for item in result["reference_drift"])
-
-    nostr = _workstream(result, "nostr-migration")
-    assert nostr["status"] == "PARTIAL"
-    assert any("timmy_client.py" in item for item in nostr["repo_evidence_present"])
-
-    lexicon = _workstream(result, "lexicon-enforcement")
-    assert all(item["aligned"] for item in lexicon["reference_results"])
-    assert lexicon["status"] == "PARTIAL"
-
-    syntax_guard = _workstream(result, "syntax-guard")
-    assert syntax_guard["status"] == "MISSING"
-    assert any("deployment verifier" in item for item in syntax_guard["missing_deliverables"])
-
-
-def test_render_markdown_includes_required_sections_and_grounding_evidence() -> None:
-    mod = _load_module(SCRIPT_PATH, "unified_fleet_sovereignty_status")
-    result = mod.evaluate_directive(snapshot=mod.default_snapshot(), repo_root=ROOT)
-    report = mod.render_markdown(result)
-
-    for snippet in (
-        "# [DIRECTIVE] Unified Fleet Sovereignty & Comms Migration",
-        "## Directive Snapshot",
-        "## Reference Drift",
-        "## Workstream Matrix",
-        "### 5. Infrastructure Hardening / Syntax Guard — MISSING",
-        "`infrastructure/timmy-bridge/client/timmy_client.py`",
-        "machine-checkable lexicon policy for review/triage",
-        "## Why #524 Remains Open",
-    ):
-        assert snippet in report
-
-
-def test_repo_contains_committed_issue_524_grounding_doc() -> None:
-    assert DOC_PATH.exists(), "missing committed directive grounding doc"
-    text = DOC_PATH.read_text(encoding="utf-8")
-    for snippet in (
-        "# [DIRECTIVE] Unified Fleet Sovereignty & Comms Migration",
-        "## Reference Drift",
-        "## Workstream Matrix",
-        "## Highest-Leverage Next Actions",
-        "## Why #524 Remains Open",
-    ):
-        assert snippet in text