fix: resolve PLR2004 magic number lint violations in splendor code

Replace magic numbers in bot.py with existing GameConfig values (max_token_take, minimum_tokens_to_buy_2) and named probability constants. Add inline noqa for argument-count checks in human.py. Remove temporary PLR2004 suppression from pyproject.toml. https://claude.ai/code/session_01C17fUuuiYc8zrwpnw2cgpr
2026-04-21 06:39:09 -04:00 · 2026-03-09 03:37:19 +00:00
71 changed files with 290 additions and 3943 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -232,7 +232,6 @@
    "pyopenweathermap",
    "pyownet",
    "pytest",
-    "qalculate",
    "quicksuggest",
    "radarr",
    "readahead",
@@ -257,7 +256,6 @@
    "sessionmaker",
    "sessionstore",
    "shellcheck",
-    "signalbot",
    "signon",
    "Signons",
    "skia",
@@ -307,7 +305,6 @@
    "useragent",
    "usernamehw",
    "userprefs",
-    "vaninventory",
    "vfat",
    "victron",
    "virt",
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -33,18 +33,15 @@
        pytest-cov
        pytest-mock
        pytest-xdist
-        python-multipart
        requests
        ruff
        scalene
        sqlalchemy
        sqlalchemy
-        tenacity
        textual
        tinytuya
        typer
        types-requests
-        websockets
      ]
    );
  };
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,27 +7,7 @@ requires-python = "~=3.13.0"
 readme = "README.md"
 license = "MIT"
 # these dependencies are a best effort and aren't guaranteed to work
-# for up-to-date dependencies, see overlays/default.nix
-dependencies = [
-    "alembic",
-    "apprise",
-    "apscheduler",
-    "httpx",
-    "python-multipart",
-    "polars",
-    "psycopg[binary]",
-    "pydantic",
-    "pyyaml",
-    "requests",
-    "sqlalchemy",
-    "typer",
-    "websockets",
-]
-
-[project.scripts]
-database = "python.database_cli:app"
-van-inventory = "python.van_inventory.main:serve"
-sheet-music-ocr = "python.sheet_music_ocr.main:app"
+dependencies = ["apprise", "apscheduler", "httpx", "polars", "pydantic", "pyyaml", "requests", "typer"]

 [dependency-groups]
 dev = [
@@ -58,10 +38,7 @@ lint.ignore = [
 [tool.ruff.lint.per-file-ignores]

 "tests/**" = [
-    "ANN",     # (perm) type annotations not needed in tests
-    "D",       # (perm) docstrings not needed in tests
-    "PLR2004", # (perm) magic values are fine in test assertions
-    "S101",    # (perm) pytest needs asserts
+    "S101", # (perm) pytest needs asserts
 ]
 "python/stuff/**" = [
    "T201", # (perm) I don't care about print statements dir
@@ -71,9 +48,8 @@ lint.ignore = [
    "ERA001", # (perm) I don't care about print statements dir
 ]
 "python/splendor/**" = [
-    "S311",    # (perm) there is no security issue here
-    "T201",    # (perm) I don't care about print statements dir
-    "PLR2004", # (temps) need to think about this
+    "S311", # (perm) there is no security issue here
+    "T201", # (perm) I don't care about print statements dir
 ]
 "python/orm/**" = [
    "TC003", # (perm) this creates issues because sqlalchemy uses these at runtime
@@ -87,9 +63,6 @@ lint.ignore = [
 "python/alembic/**" = [
    "INP001", # (perm) this creates LSP issues for alembic
 ]
-"python/signal_bot/**" = [
-    "D107", # (perm) class docstrings cover __init__
-]

 [tool.ruff.lint.pydocstyle]
 convention = "google"
--- a/python/alembic.ini
+++ b/python/alembic.ini
@@ -0,0 +1,109 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+# Use forward slashes (/) also on windows to provide an os agnostic path
+script_location = python/alembic
+
+# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
+# Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
+file_template = %%(year)d_%%(month).2d_%%(day).2d-%%(slug)s_%%(rev)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.
+prepend_sys_path = .
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the python>=3.9 or backports.zoneinfo library and tzdata library.
+# Any required deps can installed by adding `alembic[tz]` to the pip requirements
+# string value is passed to ZoneInfo()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to alembic/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "version_path_separator" below.
+# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions
+
+# version path separator; As mentioned above, this is the character used to split
+# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
+# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
+# Valid values for version_path_separator are:
+#
+# version_path_separator = :
+# version_path_separator = ;
+# version_path_separator = space
+# version_path_separator = newline
+#
+# Use os.pathsep. Default configuration used for new projects.
+version_path_separator = os
+
+# set to 'true' to search source files recursively
+# in each "version_locations" directory
+# new in Alembic version 1.10
+# recursive_version_locations = false
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+sqlalchemy.url = driver://user:pass@localhost/dbname
+
+revision_environment = true
+
+[post_write_hooks]
+
+hooks = dynamic_schema,ruff
+dynamic_schema.type = dynamic_schema
+
+ruff.type = ruff
+
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARNING
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARNING
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
--- a/python/alembic/env.py
+++ b/python/alembic/env.py
@@ -9,24 +9,20 @@ from typing import TYPE_CHECKING, Any, Literal

 from alembic import context
 from alembic.script import write_hooks
-from sqlalchemy.schema import CreateSchema

 from python.common import bash_wrapper
-from python.orm.common import get_postgres_engine
+from python.orm import RichieBase
+from python.orm.base import get_postgres_engine

 if TYPE_CHECKING:
    from collections.abc import MutableMapping

-    from sqlalchemy.orm import DeclarativeBase
-
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
 config = context.config

-base_class: type[DeclarativeBase] = config.attributes.get("base")
-if base_class is None:
-    error = "No base class provided. Use the database CLI to run alembic commands."
-    raise RuntimeError(error)

-target_metadata = base_class.metadata
+target_metadata = RichieBase.metadata
 logging.basicConfig(
    level="DEBUG",
    datefmt="%Y-%m-%dT%H:%M:%S%z",
@@ -39,24 +35,11 @@ logging.basicConfig(
 def dynamic_schema(filename: str, _options: dict[Any, Any]) -> None:
    """Dynamic schema."""
    original_file = Path(filename).read_text()
-    schema_name = base_class.schema_name
-    dynamic_schema_file_part1 = original_file.replace(f"schema='{schema_name}'", "schema=schema")
-    dynamic_schema_file = dynamic_schema_file_part1.replace(f"'{schema_name}.", "f'{schema}.")
+    dynamic_schema_file_part1 = original_file.replace(f"schema='{RichieBase.schema_name}'", "schema=schema")
+    dynamic_schema_file = dynamic_schema_file_part1.replace(f"'{RichieBase.schema_name}.", "f'{schema}.")
    Path(filename).write_text(dynamic_schema_file)


-@write_hooks.register("import_postgresql")
-def import_postgresql(filename: str, _options: dict[Any, Any]) -> None:
-    """Add postgresql dialect import when postgresql types are used."""
-    content = Path(filename).read_text()
-    if "postgresql." in content and "from sqlalchemy.dialects import postgresql" not in content:
-        content = content.replace(
-            "import sqlalchemy as sa\n",
-            "import sqlalchemy as sa\nfrom sqlalchemy.dialects import postgresql\n",
-        )
-        Path(filename).write_text(content)
-
-
@write_hooks.register("ruff")
 def ruff_check_and_format(filename: str, _options: dict[Any, Any]) -> None:
    """Docstring for ruff_check_and_format."""
@@ -69,12 +52,12 @@ def include_name(
    type_: Literal["schema", "table", "column", "index", "unique_constraint", "foreign_key_constraint"],
    _parent_names: MutableMapping[Literal["schema_name", "table_name", "schema_qualified_table_name"], str | None],
 ) -> bool:
-    """Filter tables to be included in the migration.
+    """This filter table to be included in the migration.

    Args:
        name (str): The name of the table.
        type_ (str): The type of the table.
-        _parent_names (MutableMapping): The names of the parent tables.
+        parent_names (list[str]): The names of the parent tables.

    Returns:
        bool: True if the table should be included, False otherwise.
@@ -92,30 +75,19 @@ def run_migrations_online() -> None:
    and associate a connection with the context.

    """
-    env_prefix = config.attributes.get("env_prefix", "POSTGRES")
-    connectable = get_postgres_engine(name=env_prefix)
+    connectable = get_postgres_engine()

    with connectable.connect() as connection:
-        schema = base_class.schema_name
-        if not connectable.dialect.has_schema(connection, schema):
-            answer = input(f"Schema {schema!r} does not exist. Create it? [y/N] ")
-            if answer.lower() != "y":
-                error = f"Schema {schema!r} does not exist. Exiting."
-                raise SystemExit(error)
-            connection.execute(CreateSchema(schema))
-            connection.commit()
-
        context.configure(
            connection=connection,
            target_metadata=target_metadata,
            include_schemas=True,
-            version_table_schema=schema,
+            version_table_schema=RichieBase.schema_name,
            include_name=include_name,
        )

        with context.begin_transaction():
            context.run_migrations()
-        connection.commit()


 run_migrations_online()
--- a/python/alembic/richie/versions/2026_02_12-add_congress_tracker_tables_3f71565e38de.py
+++ b/python/alembic/richie/versions/2026_02_12-add_congress_tracker_tables_3f71565e38de.py
@@ -1,135 +0,0 @@
-"""add congress tracker tables.
-
-Revision ID: 3f71565e38de
-Revises: edd7dd61a3d2
-Create Date: 2026-02-12 16:36:09.457303
-
-"""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import sqlalchemy as sa
-from alembic import op
-
-from python.orm import RichieBase
-
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
-# revision identifiers, used by Alembic.
-revision: str = "3f71565e38de"
-down_revision: str | None = "edd7dd61a3d2"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-schema = RichieBase.schema_name
-
-
-def upgrade() -> None:
-    """Upgrade."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table(
-        "bill",
-        sa.Column("congress", sa.Integer(), nullable=False),
-        sa.Column("bill_type", sa.String(), nullable=False),
-        sa.Column("number", sa.Integer(), nullable=False),
-        sa.Column("title", sa.String(), nullable=True),
-        sa.Column("title_short", sa.String(), nullable=True),
-        sa.Column("official_title", sa.String(), nullable=True),
-        sa.Column("status", sa.String(), nullable=True),
-        sa.Column("status_at", sa.Date(), nullable=True),
-        sa.Column("sponsor_bioguide_id", sa.String(), nullable=True),
-        sa.Column("subjects_top_term", sa.String(), nullable=True),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_bill")),
-        sa.UniqueConstraint("congress", "bill_type", "number", name="uq_bill_congress_type_number"),
-        schema=schema,
-    )
-    op.create_index("ix_bill_congress", "bill", ["congress"], unique=False, schema=schema)
-    op.create_table(
-        "legislator",
-        sa.Column("bioguide_id", sa.Text(), nullable=False),
-        sa.Column("thomas_id", sa.String(), nullable=True),
-        sa.Column("lis_id", sa.String(), nullable=True),
-        sa.Column("govtrack_id", sa.Integer(), nullable=True),
-        sa.Column("opensecrets_id", sa.String(), nullable=True),
-        sa.Column("fec_ids", sa.String(), nullable=True),
-        sa.Column("first_name", sa.String(), nullable=False),
-        sa.Column("last_name", sa.String(), nullable=False),
-        sa.Column("official_full_name", sa.String(), nullable=True),
-        sa.Column("nickname", sa.String(), nullable=True),
-        sa.Column("birthday", sa.Date(), nullable=True),
-        sa.Column("gender", sa.String(), nullable=True),
-        sa.Column("current_party", sa.String(), nullable=True),
-        sa.Column("current_state", sa.String(), nullable=True),
-        sa.Column("current_district", sa.Integer(), nullable=True),
-        sa.Column("current_chamber", sa.String(), nullable=True),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_legislator")),
-        schema=schema,
-    )
-    op.create_index(op.f("ix_legislator_bioguide_id"), "legislator", ["bioguide_id"], unique=True, schema=schema)
-    op.create_table(
-        "vote",
-        sa.Column("congress", sa.Integer(), nullable=False),
-        sa.Column("chamber", sa.String(), nullable=False),
-        sa.Column("session", sa.Integer(), nullable=False),
-        sa.Column("number", sa.Integer(), nullable=False),
-        sa.Column("vote_type", sa.String(), nullable=True),
-        sa.Column("question", sa.String(), nullable=True),
-        sa.Column("result", sa.String(), nullable=True),
-        sa.Column("result_text", sa.String(), nullable=True),
-        sa.Column("vote_date", sa.Date(), nullable=False),
-        sa.Column("yea_count", sa.Integer(), nullable=True),
-        sa.Column("nay_count", sa.Integer(), nullable=True),
-        sa.Column("not_voting_count", sa.Integer(), nullable=True),
-        sa.Column("present_count", sa.Integer(), nullable=True),
-        sa.Column("bill_id", sa.Integer(), nullable=True),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.ForeignKeyConstraint(["bill_id"], [f"{schema}.bill.id"], name=op.f("fk_vote_bill_id_bill")),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_vote")),
-        sa.UniqueConstraint("congress", "chamber", "session", "number", name="uq_vote_congress_chamber_session_number"),
-        schema=schema,
-    )
-    op.create_index("ix_vote_congress_chamber", "vote", ["congress", "chamber"], unique=False, schema=schema)
-    op.create_index("ix_vote_date", "vote", ["vote_date"], unique=False, schema=schema)
-    op.create_table(
-        "vote_record",
-        sa.Column("vote_id", sa.Integer(), nullable=False),
-        sa.Column("legislator_id", sa.Integer(), nullable=False),
-        sa.Column("position", sa.String(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["legislator_id"],
-            [f"{schema}.legislator.id"],
-            name=op.f("fk_vote_record_legislator_id_legislator"),
-            ondelete="CASCADE",
-        ),
-        sa.ForeignKeyConstraint(
-            ["vote_id"], [f"{schema}.vote.id"], name=op.f("fk_vote_record_vote_id_vote"), ondelete="CASCADE"
-        ),
-        sa.PrimaryKeyConstraint("vote_id", "legislator_id", name=op.f("pk_vote_record")),
-        schema=schema,
-    )
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table("vote_record", schema=schema)
-    op.drop_index("ix_vote_date", table_name="vote", schema=schema)
-    op.drop_index("ix_vote_congress_chamber", table_name="vote", schema=schema)
-    op.drop_table("vote", schema=schema)
-    op.drop_index(op.f("ix_legislator_bioguide_id"), table_name="legislator", schema=schema)
-    op.drop_table("legislator", schema=schema)
-    op.drop_index("ix_bill_congress", table_name="bill", schema=schema)
-    op.drop_table("bill", schema=schema)
-    # ### end Alembic commands ###
--- a/python/alembic/richie/versions/2026_03_09-adding_signaldevice_for_deviceregistry__4c410c16e39c.py
+++ b/python/alembic/richie/versions/2026_03_09-adding_signaldevice_for_deviceregistry__4c410c16e39c.py
@@ -1,58 +0,0 @@
-"""adding SignalDevice for DeviceRegistry for signal bot.
-
-Revision ID: 4c410c16e39c
-Revises: 3f71565e38de
-Create Date: 2026-03-09 14:51:24.228976
-
-"""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import sqlalchemy as sa
-from alembic import op
-from sqlalchemy.dialects import postgresql
-
-from python.orm import RichieBase
-
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
-# revision identifiers, used by Alembic.
-revision: str = "4c410c16e39c"
-down_revision: str | None = "3f71565e38de"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-schema = RichieBase.schema_name
-
-
-def upgrade() -> None:
-    """Upgrade."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table(
-        "signal_device",
-        sa.Column("phone_number", sa.String(length=50), nullable=False),
-        sa.Column("safety_number", sa.String(), nullable=False),
-        sa.Column(
-            "trust_level",
-            postgresql.ENUM("VERIFIED", "UNVERIFIED", "BLOCKED", name="trust_level", schema=schema),
-            nullable=False,
-        ),
-        sa.Column("last_seen", sa.DateTime(timezone=True), nullable=False),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_signal_device")),
-        sa.UniqueConstraint("phone_number", name=op.f("uq_signal_device_phone_number")),
-        schema=schema,
-    )
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table("signal_device", schema=schema)
-    # ### end Alembic commands ###
--- a/python/alembic/richie/versions/2026_03_09-fixed_safety_number_logic_99fec682516c.py
+++ b/python/alembic/richie/versions/2026_03_09-fixed_safety_number_logic_99fec682516c.py
@@ -1,41 +0,0 @@
-"""fixed safety number logic.
-
-Revision ID: 99fec682516c
-Revises: 4c410c16e39c
-Create Date: 2026-03-09 16:25:25.085806
-
-"""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import sqlalchemy as sa
-from alembic import op
-
-from python.orm import RichieBase
-
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
-# revision identifiers, used by Alembic.
-revision: str = "99fec682516c"
-down_revision: str | None = "4c410c16e39c"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-schema = RichieBase.schema_name
-
-
-def upgrade() -> None:
-    """Upgrade."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.alter_column("signal_device", "safety_number", existing_type=sa.VARCHAR(), nullable=True, schema=schema)
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.alter_column("signal_device", "safety_number", existing_type=sa.VARCHAR(), nullable=False, schema=schema)
-    # ### end Alembic commands ###
--- a/python/alembic/richie/versions/2026_03_10-add_dead_letter_message_table_a1b2c3d4e5f6.py
+++ b/python/alembic/richie/versions/2026_03_10-add_dead_letter_message_table_a1b2c3d4e5f6.py
@@ -1,54 +0,0 @@
-"""add dead_letter_message table.
-
-Revision ID: a1b2c3d4e5f6
-Revises: 99fec682516c
-Create Date: 2026-03-10 12:00:00.000000
-
-"""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import sqlalchemy as sa
-from alembic import op
-from sqlalchemy.dialects import postgresql
-
-from python.orm import RichieBase
-
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
-# revision identifiers, used by Alembic.
-revision: str = "a1b2c3d4e5f6"
-down_revision: str | None = "99fec682516c"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-schema = RichieBase.schema_name
-
-
-def upgrade() -> None:
-    """Upgrade."""
-    op.create_table(
-        "dead_letter_message",
-        sa.Column("source", sa.String(), nullable=False),
-        sa.Column("message", sa.Text(), nullable=False),
-        sa.Column("received_at", sa.DateTime(timezone=True), nullable=False),
-        sa.Column(
-            "status",
-            postgresql.ENUM("UNPROCESSED", "PROCESSED", name="message_status", schema=schema),
-            nullable=False,
-        ),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_dead_letter_message")),
-        schema=schema,
-    )
-
-
-def downgrade() -> None:
-    """Downgrade."""
-    op.drop_table("dead_letter_message", schema=schema)
-    op.execute(sa.text(f"DROP TYPE IF EXISTS {schema}.message_status"))
--- a/python/alembic/script.py.mako
+++ b/python/alembic/script.py.mako
@@ -13,7 +13,7 @@ from typing import TYPE_CHECKING
 import sqlalchemy as sa

 from alembic import op
-from python.orm import ${config.attributes["base"].__name__}
+from python.orm import RichieBase

 if TYPE_CHECKING:
    from collections.abc import Sequence
@@ -24,7 +24,7 @@ down_revision: str | None = ${repr(down_revision)}
 branch_labels: str | Sequence[str] | None = ${repr(branch_labels)}
 depends_on: str | Sequence[str] | None = ${repr(depends_on)}

-schema=${config.attributes["base"].__name__}.schema_name
+schema=RichieBase.schema_name

 def upgrade() -> None:
    """Upgrade."""
--- a/python/alembic/van_inventory/versions/2026_03_08-starting_van_invintory_15e733499804.py
+++ b/python/alembic/van_inventory/versions/2026_03_08-starting_van_invintory_15e733499804.py
@@ -1,80 +0,0 @@
-"""starting van invintory.
-
-Revision ID: 15e733499804
-Revises:
-Create Date: 2026-03-08 00:18:20.759720
-
-"""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import sqlalchemy as sa
-from alembic import op
-
-from python.orm import VanInventoryBase
-
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
-# revision identifiers, used by Alembic.
-revision: str = "15e733499804"
-down_revision: str | None = None
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-schema = VanInventoryBase.schema_name
-
-
-def upgrade() -> None:
-    """Upgrade."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table(
-        "items",
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("quantity", sa.Float(), nullable=False),
-        sa.Column("unit", sa.String(), nullable=False),
-        sa.Column("category", sa.String(), nullable=True),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_items")),
-        sa.UniqueConstraint("name", name=op.f("uq_items_name")),
-        schema=schema,
-    )
-    op.create_table(
-        "meals",
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("instructions", sa.String(), nullable=True),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_meals")),
-        sa.UniqueConstraint("name", name=op.f("uq_meals_name")),
-        schema=schema,
-    )
-    op.create_table(
-        "meal_ingredients",
-        sa.Column("meal_id", sa.Integer(), nullable=False),
-        sa.Column("item_id", sa.Integer(), nullable=False),
-        sa.Column("quantity_needed", sa.Float(), nullable=False),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.ForeignKeyConstraint(["item_id"], [f"{schema}.items.id"], name=op.f("fk_meal_ingredients_item_id_items")),
-        sa.ForeignKeyConstraint(["meal_id"], [f"{schema}.meals.id"], name=op.f("fk_meal_ingredients_meal_id_meals")),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_meal_ingredients")),
-        sa.UniqueConstraint("meal_id", "item_id", name=op.f("uq_meal_ingredients_meal_id")),
-        schema=schema,
-    )
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table("meal_ingredients", schema=schema)
-    op.drop_table("meals", schema=schema)
-    op.drop_table("items", schema=schema)
-    # ### end Alembic commands ###
--- a/python/alembic/richie/versions/2026_01_11-created_contact_api_edd7dd61a3d2.py
+++ b/python/alembic/richie/versions/2026_01_11-created_contact_api_edd7dd61a3d2.py
--- a/python/api/main.py
+++ b/python/api/main.py
@@ -16,7 +16,7 @@ from fastapi import FastAPI

 from python.api.routers import contact_router, create_frontend_router
 from python.common import configure_logger
-from python.orm.common import get_postgres_engine
+from python.orm.base import get_postgres_engine

 logger = logging.getLogger(__name__)

--- a/python/api/routers/contact.py
+++ b/python/api/routers/contact.py
@@ -6,7 +6,7 @@ from sqlalchemy import select
 from sqlalchemy.orm import selectinload

 from python.api.dependencies import DbSession
-from python.orm.richie.contact import Contact, ContactRelationship, Need, RelationshipType
+from python.orm.contact import Contact, ContactRelationship, Need, RelationshipType


 class NeedBase(BaseModel):
--- a/python/database_cli.py
+++ b/python/database_cli.py
@@ -1,115 +0,0 @@
-"""CLI wrapper around alembic for multi-database support.
-
-Usage:
-    database <db_name> <command> [args...]
-
-Examples:
-    database van_inventory upgrade head
-    database van_inventory downgrade head-1
-    database van_inventory revision --autogenerate -m "add meals table"
-    database van_inventory check
-    database richie check
-    database richie upgrade head
-"""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-from importlib import import_module
-from typing import TYPE_CHECKING, Annotated
-
-import typer
-from alembic.config import CommandLine, Config
-
-if TYPE_CHECKING:
-    from sqlalchemy.orm import DeclarativeBase
-
-
-@dataclass(frozen=True)
-class DatabaseConfig:
-    """Configuration for a database."""
-
-    env_prefix: str
-    version_location: str
-    base_module: str
-    base_class_name: str
-    models_module: str
-    script_location: str = "python/alembic"
-    file_template: str = "%%(year)d_%%(month).2d_%%(day).2d-%%(slug)s_%%(rev)s"
-
-    def get_base(self) -> type[DeclarativeBase]:
-        """Import and return the Base class."""
-        module = import_module(self.base_module)
-        return getattr(module, self.base_class_name)
-
-    def import_models(self) -> None:
-        """Import ORM models so alembic autogenerate can detect them."""
-        import_module(self.models_module)
-
-    def alembic_config(self) -> Config:
-        """Build an alembic Config for this database."""
-        # Runtime import needed — Config is in TYPE_CHECKING for the return type annotation
-        from alembic.config import Config as AlembicConfig  # noqa: PLC0415
-
-        cfg = AlembicConfig()
-        cfg.set_main_option("script_location", self.script_location)
-        cfg.set_main_option("file_template", self.file_template)
-        cfg.set_main_option("prepend_sys_path", ".")
-        cfg.set_main_option("version_path_separator", "os")
-        cfg.set_main_option("version_locations", self.version_location)
-        cfg.set_main_option("revision_environment", "true")
-        cfg.set_section_option("post_write_hooks", "hooks", "dynamic_schema,import_postgresql,ruff")
-        cfg.set_section_option("post_write_hooks", "dynamic_schema.type", "dynamic_schema")
-        cfg.set_section_option("post_write_hooks", "import_postgresql.type", "import_postgresql")
-        cfg.set_section_option("post_write_hooks", "ruff.type", "ruff")
-        cfg.attributes["base"] = self.get_base()
-        cfg.attributes["env_prefix"] = self.env_prefix
-        self.import_models()
-        return cfg
-
-
-DATABASES: dict[str, DatabaseConfig] = {
-    "richie": DatabaseConfig(
-        env_prefix="RICHIE",
-        version_location="python/alembic/richie/versions",
-        base_module="python.orm.richie.base",
-        base_class_name="RichieBase",
-        models_module="python.orm.richie",
-    ),
-    "van_inventory": DatabaseConfig(
-        env_prefix="VAN_INVENTORY",
-        version_location="python/alembic/van_inventory/versions",
-        base_module="python.orm.van_inventory.base",
-        base_class_name="VanInventoryBase",
-        models_module="python.orm.van_inventory.models",
-    ),
-}
-
-
-app = typer.Typer(help="Multi-database alembic wrapper.")
-
-
-@app.command(
-    context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
-)
-def main(
-    ctx: typer.Context,
-    db_name: Annotated[str, typer.Argument(help=f"Database name. Options: {', '.join(DATABASES)}")],
-    command: Annotated[str, typer.Argument(help="Alembic command (upgrade, downgrade, revision, check, etc.)")],
-) -> None:
-    """Run an alembic command against the specified database."""
-    db_config = DATABASES.get(db_name)
-    if not db_config:
-        typer.echo(f"Unknown database: {db_name!r}. Available: {', '.join(DATABASES)}", err=True)
-        raise typer.Exit(code=1)
-
-    alembic_cfg = db_config.alembic_config()
-
-    cmd_line = CommandLine()
-    options = cmd_line.parser.parse_args([command, *ctx.args])
-    cmd_line.run_cmd(alembic_cfg, options)
-
-
-if __name__ == "__main__":
-    app()
-
--- a/python/orm/init.py
+++ b/python/orm/init.py
@@ -1,9 +1,22 @@
 """ORM package exports."""

-from python.orm.richie.base import RichieBase
-from python.orm.van_inventory.base import VanInventoryBase
+from __future__ import annotations
+
+from python.orm.base import RichieBase, TableBase
+from python.orm.contact import (
+    Contact,
+    ContactNeed,
+    ContactRelationship,
+    Need,
+    RelationshipType,
+)

 __all__ = [
+    "Contact",
+    "ContactNeed",
+    "ContactRelationship",
+    "Need",
+    "RelationshipType",
    "RichieBase",
-    "VanInventoryBase",
+    "TableBase",
 ]
--- a/python/orm/base.py
+++ b/python/orm/base.py
@@ -0,0 +1,80 @@
+"""Base ORM definitions."""
+
+from __future__ import annotations
+
+from datetime import datetime
+from os import getenv
+from typing import cast
+
+from sqlalchemy import DateTime, MetaData, create_engine, func
+from sqlalchemy.engine import URL, Engine
+from sqlalchemy.ext.declarative import AbstractConcreteBase
+from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
+
+
+class RichieBase(DeclarativeBase):
+    """Base class for all ORM models."""
+
+    schema_name = "main"
+
+    metadata = MetaData(
+        schema=schema_name,
+        naming_convention={
+            "ix": "ix_%(table_name)s_%(column_0_name)s",
+            "uq": "uq_%(table_name)s_%(column_0_name)s",
+            "ck": "ck_%(table_name)s_%(constraint_name)s",
+            "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
+            "pk": "pk_%(table_name)s",
+        },
+    )
+
+
+class TableBase(AbstractConcreteBase, RichieBase):
+    """Abstract concrete base for tables with IDs and timestamps."""
+
+    __abstract__ = True
+
+    id: Mapped[int] = mapped_column(primary_key=True)
+    created: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True),
+        server_default=func.now(),
+    )
+    updated: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True),
+        server_default=func.now(),
+        onupdate=func.now(),
+    )
+
+
+def get_connection_info() -> tuple[str, str, str, str, str | None]:
+    """Get connection info from environment variables."""
+    database = getenv("POSTGRES_DB")
+    host = getenv("POSTGRES_HOST")
+    port = getenv("POSTGRES_PORT")
+    username = getenv("POSTGRES_USER")
+    password = getenv("POSTGRES_PASSWORD")
+
+    if None in (database, host, port, username):
+        error = f"Missing environment variables for Postgres connection.\n{database=}\n{host=}\n{port=}\n{username=}\n"
+        raise ValueError(error)
+    return cast("tuple[str, str, str, str, str | None]", (database, host, port, username, password))
+
+
+def get_postgres_engine(*, pool_pre_ping: bool = True) -> Engine:
+    """Create a SQLAlchemy engine from environment variables."""
+    database, host, port, username, password = get_connection_info()
+
+    url = URL.create(
+        drivername="postgresql+psycopg",
+        username=username,
+        password=password,
+        host=host,
+        port=int(port),
+        database=database,
+    )
+
+    return create_engine(
+        url=url,
+        pool_pre_ping=pool_pre_ping,
+        pool_recycle=1800,
+    )
--- a/python/orm/common.py
+++ b/python/orm/common.py
@@ -1,51 +0,0 @@
-"""Shared ORM definitions."""
-
-from __future__ import annotations
-
-from os import getenv
-from typing import cast
-
-from sqlalchemy import create_engine
-from sqlalchemy.engine import URL, Engine
-
-NAMING_CONVENTION = {
-    "ix": "ix_%(table_name)s_%(column_0_name)s",
-    "uq": "uq_%(table_name)s_%(column_0_name)s",
-    "ck": "ck_%(table_name)s_%(constraint_name)s",
-    "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
-    "pk": "pk_%(table_name)s",
-}
-
-
-def get_connection_info(name: str) -> tuple[str, str, str, str, str | None]:
-    """Get connection info from environment variables."""
-    database = getenv(f"{name}_DB")
-    host = getenv(f"{name}_HOST")
-    port = getenv(f"{name}_PORT")
-    username = getenv(f"{name}_USER")
-    password = getenv(f"{name}_PASSWORD")
-
-    if None in (database, host, port, username):
-        error = f"Missing environment variables for Postgres connection.\n{database=}\n{host=}\n{port=}\n{username=}\n"
-        raise ValueError(error)
-    return cast("tuple[str, str, str, str, str | None]", (database, host, port, username, password))
-
-
-def get_postgres_engine(*, name: str = "POSTGRES", pool_pre_ping: bool = True) -> Engine:
-    """Create a SQLAlchemy engine from environment variables."""
-    database, host, port, username, password = get_connection_info(name)
-
-    url = URL.create(
-        drivername="postgresql+psycopg",
-        username=username,
-        password=password,
-        host=host,
-        port=int(port),
-        database=database,
-    )
-
-    return create_engine(
-        url=url,
-        pool_pre_ping=pool_pre_ping,
-        pool_recycle=1800,
-    )
--- a/python/orm/richie/contact.py
+++ b/python/orm/richie/contact.py
@@ -2,15 +2,15 @@

 from __future__ import annotations

-from enum import StrEnum
+from enum import Enum

 from sqlalchemy import ForeignKey, String
 from sqlalchemy.orm import Mapped, mapped_column, relationship

-from python.orm.richie.base import RichieBase, TableBase
+from python.orm.base import RichieBase, TableBase


-class RelationshipType(StrEnum):
+class RelationshipType(str, Enum):
    """Relationship types with default closeness weights.

    Default weight is an integer 1-10 where 10 = closest relationship.
--- a/python/orm/richie/init.py
+++ b/python/orm/richie/init.py
@@ -1,31 +0,0 @@
-"""Richie database ORM exports."""
-
-from __future__ import annotations
-
-from python.orm.richie.base import RichieBase, TableBase
-from python.orm.richie.congress import Bill, Legislator, Vote, VoteRecord
-from python.orm.richie.contact import (
-    Contact,
-    ContactNeed,
-    ContactRelationship,
-    Need,
-    RelationshipType,
-)
-from python.orm.richie.dead_letter_message import DeadLetterMessage
-from python.orm.richie.signal_device import SignalDevice
-
-__all__ = [
-    "Bill",
-    "Contact",
-    "ContactNeed",
-    "ContactRelationship",
-    "DeadLetterMessage",
-    "Legislator",
-    "Need",
-    "RelationshipType",
-    "RichieBase",
-    "SignalDevice",
-    "TableBase",
-    "Vote",
-    "VoteRecord",
-]
--- a/python/orm/richie/base.py
+++ b/python/orm/richie/base.py
@@ -1,39 +0,0 @@
-"""Richie database ORM base."""
-
-from __future__ import annotations
-
-from datetime import datetime
-
-from sqlalchemy import DateTime, MetaData, func
-from sqlalchemy.ext.declarative import AbstractConcreteBase
-from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
-
-from python.orm.common import NAMING_CONVENTION
-
-
-class RichieBase(DeclarativeBase):
-    """Base class for richie database ORM models."""
-
-    schema_name = "main"
-
-    metadata = MetaData(
-        schema=schema_name,
-        naming_convention=NAMING_CONVENTION,
-    )
-
-
-class TableBase(AbstractConcreteBase, RichieBase):
-    """Abstract concrete base for richie tables with IDs and timestamps."""
-
-    __abstract__ = True
-
-    id: Mapped[int] = mapped_column(primary_key=True)
-    created: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True),
-        server_default=func.now(),
-    )
-    updated: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True),
-        server_default=func.now(),
-        onupdate=func.now(),
-    )
--- a/python/orm/richie/congress.py
+++ b/python/orm/richie/congress.py
@@ -1,150 +0,0 @@
-"""Congress Tracker database models."""
-
-from __future__ import annotations
-
-from datetime import date
-
-from sqlalchemy import ForeignKey, Index, Text, UniqueConstraint
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from python.orm.richie.base import RichieBase, TableBase
-
-
-class Legislator(TableBase):
-    """Legislator model - members of Congress."""
-
-    __tablename__ = "legislator"
-
-    # Natural key - bioguide ID is the authoritative identifier
-    bioguide_id: Mapped[str] = mapped_column(Text, unique=True, index=True)
-
-    # Other IDs for cross-referencing
-    thomas_id: Mapped[str | None]
-    lis_id: Mapped[str | None]
-    govtrack_id: Mapped[int | None]
-    opensecrets_id: Mapped[str | None]
-    fec_ids: Mapped[str | None]  # JSON array stored as string
-
-    # Name info
-    first_name: Mapped[str]
-    last_name: Mapped[str]
-    official_full_name: Mapped[str | None]
-    nickname: Mapped[str | None]
-
-    # Bio
-    birthday: Mapped[date | None]
-    gender: Mapped[str | None]  # M/F
-
-    # Current term info (denormalized for query efficiency)
-    current_party: Mapped[str | None]
-    current_state: Mapped[str | None]
-    current_district: Mapped[int | None]  # House only
-    current_chamber: Mapped[str | None]  # rep/sen
-
-    # Relationships
-    vote_records: Mapped[list[VoteRecord]] = relationship(
-        "VoteRecord",
-        back_populates="legislator",
-        cascade="all, delete-orphan",
-    )
-
-
-class Bill(TableBase):
-    """Bill model - legislation introduced in Congress."""
-
-    __tablename__ = "bill"
-
-    # Composite natural key: congress + bill_type + number
-    congress: Mapped[int]
-    bill_type: Mapped[str]  # hr, s, hres, sres, hjres, sjres
-    number: Mapped[int]
-
-    # Bill info
-    title: Mapped[str | None]
-    title_short: Mapped[str | None]
-    official_title: Mapped[str | None]
-
-    # Status
-    status: Mapped[str | None]
-    status_at: Mapped[date | None]
-
-    # Sponsor
-    sponsor_bioguide_id: Mapped[str | None]
-
-    # Subjects
-    subjects_top_term: Mapped[str | None]
-
-    # Relationships
-    votes: Mapped[list[Vote]] = relationship(
-        "Vote",
-        back_populates="bill",
-    )
-
-    __table_args__ = (
-        UniqueConstraint("congress", "bill_type", "number", name="uq_bill_congress_type_number"),
-        Index("ix_bill_congress", "congress"),
-    )
-
-
-class Vote(TableBase):
-    """Vote model - roll call votes in Congress."""
-
-    __tablename__ = "vote"
-
-    # Composite natural key: congress + chamber + session + number
-    congress: Mapped[int]
-    chamber: Mapped[str]  # house/senate
-    session: Mapped[int]
-    number: Mapped[int]
-
-    # Vote details
-    vote_type: Mapped[str | None]
-    question: Mapped[str | None]
-    result: Mapped[str | None]
-    result_text: Mapped[str | None]
-
-    # Timing
-    vote_date: Mapped[date]
-
-    # Vote counts (denormalized for efficiency)
-    yea_count: Mapped[int | None]
-    nay_count: Mapped[int | None]
-    not_voting_count: Mapped[int | None]
-    present_count: Mapped[int | None]
-
-    # Related bill (optional - not all votes are on bills)
-    bill_id: Mapped[int | None] = mapped_column(ForeignKey("main.bill.id"))
-
-    # Relationships
-    bill: Mapped[Bill | None] = relationship("Bill", back_populates="votes")
-    vote_records: Mapped[list[VoteRecord]] = relationship(
-        "VoteRecord",
-        back_populates="vote",
-        cascade="all, delete-orphan",
-    )
-
-    __table_args__ = (
-        UniqueConstraint("congress", "chamber", "session", "number", name="uq_vote_congress_chamber_session_number"),
-        Index("ix_vote_date", "vote_date"),
-        Index("ix_vote_congress_chamber", "congress", "chamber"),
-    )
-
-
-class VoteRecord(RichieBase):
-    """Association table: Vote <-> Legislator with position."""
-
-    __tablename__ = "vote_record"
-
-    vote_id: Mapped[int] = mapped_column(
-        ForeignKey("main.vote.id", ondelete="CASCADE"),
-        primary_key=True,
-    )
-    legislator_id: Mapped[int] = mapped_column(
-        ForeignKey("main.legislator.id", ondelete="CASCADE"),
-        primary_key=True,
-    )
-    position: Mapped[str]  # Yea, Nay, Not Voting, Present
-
-    # Relationships
-    vote: Mapped[Vote] = relationship("Vote", back_populates="vote_records")
-    legislator: Mapped[Legislator] = relationship("Legislator", back_populates="vote_records")
--- a/python/orm/richie/dead_letter_message.py
+++ b/python/orm/richie/dead_letter_message.py
@@ -1,26 +0,0 @@
-"""Dead letter queue for Signal bot messages that fail processing."""
-
-from __future__ import annotations
-
-from datetime import datetime
-
-from sqlalchemy import DateTime, Text
-from sqlalchemy.dialects.postgresql import ENUM
-from sqlalchemy.orm import Mapped, mapped_column
-
-from python.orm.richie.base import TableBase
-from python.signal_bot.models import MessageStatus
-
-
-class DeadLetterMessage(TableBase):
-    """A Signal message that failed processing and was sent to the dead letter queue."""
-
-    __tablename__ = "dead_letter_message"
-
-    source: Mapped[str]
-    message: Mapped[str] = mapped_column(Text)
-    received_at: Mapped[datetime] = mapped_column(DateTime(timezone=True))
-    status: Mapped[MessageStatus] = mapped_column(
-        ENUM(MessageStatus, name="message_status", create_type=True, schema="main"),
-        default=MessageStatus.UNPROCESSED,
-    )
--- a/python/orm/richie/signal_device.py
+++ b/python/orm/richie/signal_device.py
@@ -1,26 +0,0 @@
-"""Signal bot device registry models."""
-
-from __future__ import annotations
-
-from datetime import datetime
-
-from sqlalchemy import DateTime, String
-from sqlalchemy.dialects.postgresql import ENUM
-from sqlalchemy.orm import Mapped, mapped_column
-
-from python.orm.richie.base import TableBase
-from python.signal_bot.models import TrustLevel
-
-
-class SignalDevice(TableBase):
-    """A Signal device tracked by phone number and safety number."""
-
-    __tablename__ = "signal_device"
-
-    phone_number: Mapped[str] = mapped_column(String(50), unique=True)
-    safety_number: Mapped[str | None]
-    trust_level: Mapped[TrustLevel] = mapped_column(
-        ENUM(TrustLevel, name="trust_level", create_type=True, schema="main"),
-        default=TrustLevel.UNVERIFIED,
-    )
-    last_seen: Mapped[datetime] = mapped_column(DateTime(timezone=True))
--- a/python/orm/van_inventory/init.py
+++ b/python/orm/van_inventory/init.py
@@ -1 +0,0 @@
-"""Van inventory database ORM exports."""
--- a/python/orm/van_inventory/base.py
+++ b/python/orm/van_inventory/base.py
@@ -1,39 +0,0 @@
-"""Van inventory database ORM base."""
-
-from __future__ import annotations
-
-from datetime import datetime
-
-from sqlalchemy import DateTime, MetaData, func
-from sqlalchemy.ext.declarative import AbstractConcreteBase
-from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
-
-from python.orm.common import NAMING_CONVENTION
-
-
-class VanInventoryBase(DeclarativeBase):
-    """Base class for van_inventory database ORM models."""
-
-    schema_name = "main"
-
-    metadata = MetaData(
-        schema=schema_name,
-        naming_convention=NAMING_CONVENTION,
-    )
-
-
-class VanTableBase(AbstractConcreteBase, VanInventoryBase):
-    """Abstract concrete base for van_inventory tables with IDs and timestamps."""
-
-    __abstract__ = True
-
-    id: Mapped[int] = mapped_column(primary_key=True)
-    created: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True),
-        server_default=func.now(),
-    )
-    updated: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True),
-        server_default=func.now(),
-        onupdate=func.now(),
-    )
--- a/python/orm/van_inventory/models.py
+++ b/python/orm/van_inventory/models.py
@@ -1,46 +0,0 @@
-"""Van inventory ORM models."""
-
-from __future__ import annotations
-
-from sqlalchemy import ForeignKey, UniqueConstraint
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from python.orm.van_inventory.base import VanTableBase
-
-
-class Item(VanTableBase):
-    """A food item in the van."""
-
-    __tablename__ = "items"
-
-    name: Mapped[str] = mapped_column(unique=True)
-    quantity: Mapped[float] = mapped_column(default=0)
-    unit: Mapped[str]
-    category: Mapped[str | None]
-
-    meal_ingredients: Mapped[list[MealIngredient]] = relationship(back_populates="item")
-
-
-class Meal(VanTableBase):
-    """A meal that can be made from items in the van."""
-
-    __tablename__ = "meals"
-
-    name: Mapped[str] = mapped_column(unique=True)
-    instructions: Mapped[str | None]
-
-    ingredients: Mapped[list[MealIngredient]] = relationship(back_populates="meal")
-
-
-class MealIngredient(VanTableBase):
-    """Links a meal to the items it requires, with quantities."""
-
-    __tablename__ = "meal_ingredients"
-    __table_args__ = (UniqueConstraint("meal_id", "item_id"),)
-
-    meal_id: Mapped[int] = mapped_column(ForeignKey("meals.id"))
-    item_id: Mapped[int] = mapped_column(ForeignKey("items.id"))
-    quantity_needed: Mapped[float]
-
-    meal: Mapped[Meal] = relationship(back_populates="ingredients")
-    item: Mapped[Item] = relationship(back_populates="meal_ingredients")
--- a/python/sheet_music_ocr/init.py
+++ b/python/sheet_music_ocr/init.py
@@ -1 +0,0 @@
-"""Sheet music OCR tool using Audiveris."""
--- a/python/sheet_music_ocr/audiveris.py
+++ b/python/sheet_music_ocr/audiveris.py
@@ -1,62 +0,0 @@
-"""Audiveris subprocess wrapper for optical music recognition."""
-
-from __future__ import annotations
-
-import shutil
-import subprocess
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from pathlib import Path
-
-
-class AudiverisError(Exception):
-    """Raised when Audiveris processing fails."""
-
-
-def find_audiveris() -> str:
-    """Find the Audiveris executable on PATH.
-
-    Returns:
-        Path to the audiveris executable.
-
-    Raises:
-        AudiverisError: If Audiveris is not found.
-    """
-    path = shutil.which("audiveris")
-    if not path:
-        msg = "Audiveris not found on PATH. Install it via 'nix develop' or add it to your environment."
-        raise AudiverisError(msg)
-    return path
-
-
-def run_audiveris(input_path: Path, output_dir: Path) -> Path:
-    """Run Audiveris on an input file and return the path to the generated .mxl.
-
-    Args:
-        input_path: Path to the input sheet music file (PDF, PNG, JPG, TIFF).
-        output_dir: Directory where Audiveris will write its output.
-
-    Returns:
-        Path to the generated .mxl file.
-
-    Raises:
-        AudiverisError: If Audiveris fails or produces no output.
-    """
-    audiveris = find_audiveris()
-    result = subprocess.run(
-        [audiveris, "-batch", "-export", "-output", str(output_dir), str(input_path)],
-        capture_output=True,
-        text=True,
-        check=False,
-    )
-    if result.returncode != 0:
-        msg = f"Audiveris failed (exit {result.returncode}):\n{result.stderr}"
-        raise AudiverisError(msg)
-
-    mxl_files = list(output_dir.rglob("*.mxl"))
-    if not mxl_files:
-        msg = f"Audiveris produced no .mxl output in {output_dir}"
-        raise AudiverisError(msg)
-
-    return mxl_files[0]
--- a/python/sheet_music_ocr/main.py
+++ b/python/sheet_music_ocr/main.py
@@ -1,123 +0,0 @@
-"""CLI tool for converting scanned sheet music to MusicXML.
-
-Usage:
-    sheet-music-ocr convert scan.pdf
-    sheet-music-ocr convert scan.png -o output.mxml
-    sheet-music-ocr review output.mxml --provider claude
-"""
-
-from __future__ import annotations
-
-import tempfile
-import zipfile
-from pathlib import Path
-from typing import Annotated
-
-import typer
-
-from python.sheet_music_ocr.audiveris import AudiverisError, run_audiveris
-from python.sheet_music_ocr.review import LLMProvider, ReviewError, review_mxml
-
-SUPPORTED_EXTENSIONS = {".pdf", ".png", ".jpg", ".jpeg", ".tiff", ".tif"}
-
-app = typer.Typer(help="Convert scanned sheet music to MusicXML using Audiveris.")
-
-
-def extract_mxml_from_mxl(mxl_path: Path, output_path: Path) -> Path:
-    """Extract the MusicXML file from an .mxl archive.
-
-    An .mxl file is a ZIP archive containing one or more .xml MusicXML files.
-
-    Args:
-        mxl_path: Path to the .mxl file.
-        output_path: Path where the extracted .mxml file should be written.
-
-    Returns:
-        The output path.
-
-    Raises:
-        FileNotFoundError: If no MusicXML file is found inside the archive.
-    """
-    with zipfile.ZipFile(mxl_path, "r") as zf:
-        xml_names = [n for n in zf.namelist() if n.endswith(".xml") and not n.startswith("META-INF")]
-        if not xml_names:
-            msg = f"No MusicXML (.xml) file found inside {mxl_path}"
-            raise FileNotFoundError(msg)
-        with zf.open(xml_names[0]) as src, output_path.open("wb") as dst:
-            dst.write(src.read())
-    return output_path
-
-
-@app.command()
-def convert(
-    input_file: Annotated[Path, typer.Argument(help="Path to sheet music scan (PDF, PNG, JPG, TIFF).")],
-    output: Annotated[
-        Path | None,
-        typer.Option("--output", "-o", help="Output .mxml file path. Defaults to <input_stem>.mxml."),
-    ] = None,
-) -> None:
-    """Convert a scanned sheet music file to MusicXML."""
-    if not input_file.exists():
-        typer.echo(f"Error: {input_file} does not exist.", err=True)
-        raise typer.Exit(code=1)
-
-    if input_file.suffix.lower() not in SUPPORTED_EXTENSIONS:
-        typer.echo(
-            f"Error: Unsupported format '{input_file.suffix}'. Supported: {', '.join(sorted(SUPPORTED_EXTENSIONS))}",
-            err=True,
-        )
-        raise typer.Exit(code=1)
-
-    output_path = output or input_file.with_suffix(".mxml")
-
-    with tempfile.TemporaryDirectory() as tmpdir:
-        try:
-            mxl_path = run_audiveris(input_file, Path(tmpdir))
-        except AudiverisError as e:
-            typer.echo(f"Error: {e}", err=True)
-            raise typer.Exit(code=1) from e
-
-        try:
-            extract_mxml_from_mxl(mxl_path, output_path)
-        except FileNotFoundError as e:
-            typer.echo(f"Error: {e}", err=True)
-            raise typer.Exit(code=1) from e
-
-    typer.echo(f"Written: {output_path}")
-
-
-@app.command()
-def review(
-    input_file: Annotated[Path, typer.Argument(help="Path to MusicXML (.mxml) file to review.")],
-    output: Annotated[
-        Path | None,
-        typer.Option("--output", "-o", help="Output path for corrected .mxml. Defaults to overwriting input."),
-    ] = None,
-    provider: Annotated[
-        LLMProvider,
-        typer.Option("--provider", "-p", help="LLM provider to use."),
-    ] = LLMProvider.CLAUDE,
-) -> None:
-    """Review and fix a MusicXML file using an LLM."""
-    if not input_file.exists():
-        typer.echo(f"Error: {input_file} does not exist.", err=True)
-        raise typer.Exit(code=1)
-
-    if input_file.suffix.lower() != ".mxml":
-        typer.echo("Error: Input file must be a .mxml file.", err=True)
-        raise typer.Exit(code=1)
-
-    output_path = output or input_file
-
-    try:
-        corrected = review_mxml(input_file, provider)
-    except ReviewError as e:
-        typer.echo(f"Error: {e}", err=True)
-        raise typer.Exit(code=1) from e
-
-    output_path.write_text(corrected, encoding="utf-8")
-    typer.echo(f"Reviewed: {output_path}")
-
-
-if __name__ == "__main__":
-    app()
--- a/python/sheet_music_ocr/review.py
+++ b/python/sheet_music_ocr/review.py
@@ -1,126 +0,0 @@
-"""LLM-based MusicXML review and correction.
-
-Supports both Claude (Anthropic) and OpenAI APIs for reviewing
-MusicXML output from Audiveris and suggesting/applying fixes.
-"""
-
-from __future__ import annotations
-
-import enum
-import os
-from typing import TYPE_CHECKING
-
-import httpx
-
-if TYPE_CHECKING:
-    from pathlib import Path
-
-REVIEW_PROMPT = """\
-You are a music notation expert. Review the following MusicXML file produced by \
-optical music recognition (Audiveris). Look for and fix common OCR errors including:
-
- Incorrect note pitches or durations
- Wrong or missing key signatures, time signatures, or clefs
- Incorrect rest durations or placements
- Missing or incorrect accidentals
- Wrong beam groupings or tuplets
- Garbled or misspelled lyrics and text annotations
- Missing or incorrect dynamic markings
- Incorrect measure numbers or barline types
- Voice/staff assignment errors
-
-Return ONLY the corrected MusicXML. Do not include any explanation, commentary, or \
-markdown formatting. Output the raw XML directly.
-
-Here is the MusicXML to review:
-
-"""
-
-_TIMEOUT = 300
-
-
-class LLMProvider(enum.StrEnum):
-    """Supported LLM providers."""
-
-    CLAUDE = "claude"
-    OPENAI = "openai"
-
-
-class ReviewError(Exception):
-    """Raised when LLM review fails."""
-
-
-def _get_api_key(provider: LLMProvider) -> str:
-    env_var = "ANTHROPIC_API_KEY" if provider == LLMProvider.CLAUDE else "OPENAI_API_KEY"
-    key = os.environ.get(env_var)
-    if not key:
-        msg = f"{env_var} environment variable is not set."
-        raise ReviewError(msg)
-    return key
-
-
-def _call_claude(content: str, api_key: str) -> str:
-    response = httpx.post(
-        "https://api.anthropic.com/v1/messages",
-        headers={
-            "x-api-key": api_key,
-            "anthropic-version": "2023-06-01",
-            "content-type": "application/json",
-        },
-        json={
-            "model": "claude-sonnet-4-20250514",
-            "max_tokens": 16384,
-            "messages": [{"role": "user", "content": REVIEW_PROMPT + content}],
-        },
-        timeout=_TIMEOUT,
-    )
-    if response.status_code != 200:  # noqa: PLR2004
-        msg = f"Claude API error ({response.status_code}): {response.text}"
-        raise ReviewError(msg)
-
-    data = response.json()
-    return data["content"][0]["text"]
-
-
-def _call_openai(content: str, api_key: str) -> str:
-    response = httpx.post(
-        "https://api.openai.com/v1/chat/completions",
-        headers={
-            "Authorization": f"Bearer {api_key}",
-            "Content-Type": "application/json",
-        },
-        json={
-            "model": "gpt-4o",
-            "messages": [{"role": "user", "content": REVIEW_PROMPT + content}],
-            "max_tokens": 16384,
-        },
-        timeout=_TIMEOUT,
-    )
-    if response.status_code != 200:  # noqa: PLR2004
-        msg = f"OpenAI API error ({response.status_code}): {response.text}"
-        raise ReviewError(msg)
-
-    data = response.json()
-    return data["choices"][0]["message"]["content"]
-
-
-def review_mxml(mxml_path: Path, provider: LLMProvider) -> str:
-    """Review a MusicXML file using an LLM and return corrected content.
-
-    Args:
-        mxml_path: Path to the .mxml file to review.
-        provider: Which LLM provider to use.
-
-    Returns:
-        The corrected MusicXML content as a string.
-
-    Raises:
-        ReviewError: If the API call fails or the key is missing.
-        FileNotFoundError: If the input file does not exist.
-    """
-    content = mxml_path.read_text(encoding="utf-8")
-    api_key = _get_api_key(provider)
-
-    if provider == LLMProvider.CLAUDE:
-        return _call_claude(content, api_key)
-    return _call_openai(content, api_key)
--- a/python/signal_bot/init.py
+++ b/python/signal_bot/init.py
@@ -1 +0,0 @@
-"""Signal command and control bot."""
--- a/python/signal_bot/commands/init.py
+++ b/python/signal_bot/commands/init.py
@@ -1 +0,0 @@
-"""Signal bot commands."""
--- a/python/signal_bot/commands/inventory.py
+++ b/python/signal_bot/commands/inventory.py
@@ -1,137 +0,0 @@
-"""Van inventory command — parse receipts and item lists via LLM, push to API."""
-
-from __future__ import annotations
-
-import json
-import logging
-from typing import TYPE_CHECKING, Any
-
-import httpx
-
-from python.signal_bot.models import InventoryItem, InventoryUpdate
-
-if TYPE_CHECKING:
-    from python.signal_bot.llm_client import LLMClient
-    from python.signal_bot.models import SignalMessage
-    from python.signal_bot.signal_client import SignalClient
-
-logger = logging.getLogger(__name__)
-
-SYSTEM_PROMPT = """\
-You are an inventory assistant. Extract items from the input and return ONLY
-a JSON array. Each element must have these fields:
-  - "name": item name (string)
-  - "quantity": numeric count or amount (default 1)
-  - "unit": unit of measure (e.g. "each", "lb", "oz", "gallon", "bag", "box")
-  - "category": category like "food", "tools", "supplies", etc.
-  - "notes": any extra detail (empty string if none)
-
-Example output:
-[{"name": "water bottles", "quantity": 6, "unit": "gallon", "category": "supplies", "notes": "1 gallon each"}]
-
-Return ONLY the JSON array, no other text.\
-"""
-
-IMAGE_PROMPT = "Extract all items from this receipt or inventory photo."
-TEXT_PROMPT = "Extract all items from this inventory list."
-
-
-def parse_llm_response(raw: str) -> list[InventoryItem]:
-    """Parse the LLM JSON response into InventoryItem list."""
-    text = raw.strip()
-    # Strip markdown code fences if present
-    if text.startswith("```"):
-        lines = text.split("\n")
-        lines = [line for line in lines if not line.startswith("```")]
-        text = "\n".join(lines)
-
-    items_data: list[dict[str, Any]] = json.loads(text)
-    return [InventoryItem.model_validate(item) for item in items_data]
-
-
-def _upsert_item(api_url: str, item: InventoryItem) -> None:
-    """Create or update an item via the van_inventory API.
-
-    Fetches existing items, and if one with the same name exists,
-    patches its quantity (summing). Otherwise creates a new item.
-    """
-    base = api_url.rstrip("/")
-    response = httpx.get(f"{base}/api/items", timeout=10)
-    response.raise_for_status()
-    existing: list[dict[str, Any]] = response.json()
-
-    match = next((e for e in existing if e["name"].lower() == item.name.lower()), None)
-
-    if match:
-        new_qty = match["quantity"] + item.quantity
-        patch = {"quantity": new_qty}
-        if item.category:
-            patch["category"] = item.category
-        response = httpx.patch(f"{base}/api/items/{match['id']}", json=patch, timeout=10)
-        response.raise_for_status()
-        return
-    payload = {
-        "name": item.name,
-        "quantity": item.quantity,
-        "unit": item.unit,
-        "category": item.category or None,
-    }
-    response = httpx.post(f"{base}/api/items", json=payload, timeout=10)
-    response.raise_for_status()
-
-
-def handle_inventory_update(
-    message: SignalMessage,
-    signal: SignalClient,
-    llm: LLMClient,
-    api_url: str,
-) -> InventoryUpdate:
-    """Process an inventory update from a Signal message.
-
-    Accepts either an image (receipt photo) or text list.
-    Uses the LLM to extract structured items, then pushes to the van_inventory API.
-    """
-    try:
-        logger.info(f"Processing inventory update from {message.source}")
-        if message.attachments:
-            image_data = signal.get_attachment(message.attachments[0])
-            raw_response = llm.chat(
-                IMAGE_PROMPT,
-                image_data=image_data,
-                system=SYSTEM_PROMPT,
-            )
-            source_type = "receipt_photo"
-        elif message.message.strip():
-            raw_response = llm.chat(
-                f"{TEXT_PROMPT}\n\n{message.message}",
-                system=SYSTEM_PROMPT,
-            )
-            source_type = "text_list"
-        else:
-            signal.reply(message, "Send a photo of a receipt or a text list of items to update inventory.")
-            return InventoryUpdate()
-
-        logger.info(f"{raw_response=}")
-
-        new_items = parse_llm_response(raw_response)
-
-        logger.info(f"{new_items=}")
-
-        for item in new_items:
-            _upsert_item(api_url, item)
-
-        summary = _format_summary(new_items)
-        signal.reply(message, f"Inventory updated with {len(new_items)} item(s):\n{summary}")
-
-        return InventoryUpdate(items=new_items, raw_response=raw_response, source_type=source_type)
-
-    except Exception:
-        logger.exception("Failed to process inventory update")
-        signal.reply(message, "Failed to process inventory update. Check logs for details.")
-        return InventoryUpdate()
-
-
-def _format_summary(items: list[InventoryItem]) -> str:
-    """Format items into a readable summary."""
-    lines = [f"  - {item.name} x{item.quantity} {item.unit} [{item.category}]" for item in items]
-    return "\n".join(lines)
--- a/python/signal_bot/device_registry.py
+++ b/python/signal_bot/device_registry.py
@@ -1,185 +0,0 @@
-"""Device registry — tracks verified/unverified devices by safety number."""
-
-from __future__ import annotations
-
-import logging
-from datetime import datetime, timedelta
-from typing import TYPE_CHECKING, NamedTuple
-
-from sqlalchemy import select
-from sqlalchemy.orm import Session
-
-from python.common import utcnow
-from python.orm.richie.signal_device import SignalDevice
-from python.signal_bot.models import TrustLevel
-
-if TYPE_CHECKING:
-    from sqlalchemy.engine import Engine
-
-    from python.signal_bot.signal_client import SignalClient
-
-logger = logging.getLogger(__name__)
-
-_BLOCKED_TTL = timedelta(minutes=60)
-_DEFAULT_TTL = timedelta(minutes=5)
-
-
-class _CacheEntry(NamedTuple):
-    expires: datetime
-    trust_level: TrustLevel
-    has_safety_number: bool
-    safety_number: str | None
-
-
-class DeviceRegistry:
-    """Manage device trust based on Signal safety numbers.
-
-    Devices start as UNVERIFIED. An admin verifies them over SSH by calling
-    ``verify(phone_number)`` which marks the device VERIFIED and also tells
-    signal-cli to trust the identity.
-
-    Only VERIFIED devices may execute commands.
-    """
-
-    def __init__(self, signal_client: SignalClient, engine: Engine) -> None:
-        self.signal_client = signal_client
-        self.engine = engine
-        self._contact_cache: dict[str, _CacheEntry] = {}
-
-    def is_verified(self, phone_number: str) -> bool:
-        """Check if a phone number is verified."""
-        if entry := self._cached(phone_number):
-            return entry.trust_level == TrustLevel.VERIFIED
-        device = self.get_device(phone_number)
-        return device is not None and device.trust_level == TrustLevel.VERIFIED
-
-    def record_contact(self, phone_number: str, safety_number: str | None = None) -> None:
-        """Record seeing a device. Creates entry if new, updates last_seen."""
-        now = utcnow()
-
-        entry = self._cached(phone_number)
-        if entry and entry.safety_number == safety_number:
-            return
-
-        with Session(self.engine) as session:
-            device = session.execute(
-                select(SignalDevice).where(SignalDevice.phone_number == phone_number)
-            ).scalar_one_or_none()
-
-            if device:
-                if device.safety_number != safety_number and device.trust_level != TrustLevel.BLOCKED:
-                    logger.warning(f"Safety number changed for {phone_number}, resetting to UNVERIFIED")
-                    device.safety_number = safety_number
-                    device.trust_level = TrustLevel.UNVERIFIED
-                device.last_seen = now
-            else:
-                device = SignalDevice(
-                    phone_number=phone_number,
-                    safety_number=safety_number,
-                    trust_level=TrustLevel.UNVERIFIED,
-                    last_seen=now,
-                )
-                session.add(device)
-                logger.info(f"New device registered: {phone_number}")
-
-            session.commit()
-
-            ttl = _BLOCKED_TTL if device.trust_level == TrustLevel.BLOCKED else _DEFAULT_TTL
-            self._contact_cache[phone_number] = _CacheEntry(
-                expires=now + ttl,
-                trust_level=device.trust_level,
-                has_safety_number=device.safety_number is not None,
-                safety_number=device.safety_number,
-            )
-
-    def has_safety_number(self, phone_number: str) -> bool:
-        """Check if a device has a safety number on file."""
-        if entry := self._cached(phone_number):
-            return entry.has_safety_number
-        device = self.get_device(phone_number)
-        return device is not None and device.safety_number is not None
-
-    def verify(self, phone_number: str) -> bool:
-        """Mark a device as verified. Called by admin over SSH.
-
-        Returns True if the device was found and verified.
-        """
-        with Session(self.engine) as session:
-            device = session.execute(
-                select(SignalDevice).where(SignalDevice.phone_number == phone_number)
-            ).scalar_one_or_none()
-
-            if not device:
-                logger.warning(f"Cannot verify unknown device: {phone_number}")
-                return False
-
-            device.trust_level = TrustLevel.VERIFIED
-            self.signal_client.trust_identity(phone_number, trust_all_known_keys=True)
-            session.commit()
-            self._contact_cache[phone_number] = _CacheEntry(
-                expires=utcnow() + _DEFAULT_TTL,
-                trust_level=TrustLevel.VERIFIED,
-                has_safety_number=device.safety_number is not None,
-                safety_number=device.safety_number,
-            )
-            logger.info(f"Device verified: {phone_number}")
-            return True
-
-    def block(self, phone_number: str) -> bool:
-        """Block a device."""
-        return self._set_trust(phone_number, TrustLevel.BLOCKED, "Device blocked")
-
-    def unverify(self, phone_number: str) -> bool:
-        """Reset a device to unverified."""
-        return self._set_trust(phone_number, TrustLevel.UNVERIFIED)
-
-    def list_devices(self) -> list[SignalDevice]:
-        """Return all known devices."""
-        with Session(self.engine) as session:
-            return list(session.execute(select(SignalDevice)).scalars().all())
-
-    def sync_identities(self) -> None:
-        """Pull identity list from signal-cli and record any new ones."""
-        identities = self.signal_client.get_identities()
-        for identity in identities:
-            number = identity.get("number", "")
-            safety = identity.get("safety_number", identity.get("fingerprint", ""))
-            if number:
-                self.record_contact(number, safety)
-
-    def _cached(self, phone_number: str) -> _CacheEntry | None:
-        """Return the cache entry if it exists and hasn't expired."""
-        entry = self._contact_cache.get(phone_number)
-        if entry and utcnow() < entry.expires:
-            return entry
-        return None
-
-    def get_device(self, phone_number: str) -> SignalDevice | None:
-        """Fetch a device by phone number."""
-        with Session(self.engine) as session:
-            return session.execute(
-                select(SignalDevice).where(SignalDevice.phone_number == phone_number)
-            ).scalar_one_or_none()
-
-    def _set_trust(self, phone_number: str, level: str, log_msg: str | None = None) -> bool:
-        """Update the trust level for a device."""
-        with Session(self.engine) as session:
-            device = session.execute(
-                select(SignalDevice).where(SignalDevice.phone_number == phone_number)
-            ).scalar_one_or_none()
-
-            if not device:
-                return False
-
-            device.trust_level = level
-            session.commit()
-            ttl = _BLOCKED_TTL if level == TrustLevel.BLOCKED else _DEFAULT_TTL
-            self._contact_cache[phone_number] = _CacheEntry(
-                expires=utcnow() + ttl,
-                trust_level=level,
-                has_safety_number=device.safety_number is not None,
-                safety_number=device.safety_number,
-            )
-            if log_msg:
-                logger.info(f"{log_msg}: {phone_number}")
-            return True
--- a/python/signal_bot/llm_client.py
+++ b/python/signal_bot/llm_client.py
@@ -1,72 +0,0 @@
-"""Flexible LLM client for ollama backends."""
-
-from __future__ import annotations
-
-import base64
-import logging
-from typing import Any, Self
-
-import httpx
-
-logger = logging.getLogger(__name__)
-
-
-class LLMClient:
-    """Talk to an ollama instance.
-
-    Args:
-        model: Ollama model name.
-        host: Ollama host.
-        port: Ollama port.
-        temperature: Sampling temperature.
-    """
-
-    def __init__(self, model: str, host: str, port: int = 11434, *, temperature: float = 0.1) -> None:
-        self.model = model
-        self.temperature = temperature
-        self._client = httpx.Client(base_url=f"http://{host}:{port}", timeout=120)
-
-    def chat(self, prompt: str, image_data: bytes | None = None, system: str | None = None) -> str:
-        """Send a text prompt and return the response."""
-        messages: list[dict[str, Any]] = []
-        if system:
-            messages.append({"role": "system", "content": system})
-
-        user_msg = {"role": "user", "content": prompt}
-        if image_data:
-            user_msg["images"] = [base64.b64encode(image_data).decode()]
-
-        messages.append(user_msg)
-        return self._generate(messages)
-
-    def _generate(self, messages: list[dict[str, Any]]) -> str:
-        """Call the ollama chat API."""
-        payload = {
-            "model": self.model,
-            "messages": messages,
-            "stream": False,
-            "options": {"temperature": self.temperature},
-        }
-        logger.info(f"LLM request to {self.model}")
-        response = self._client.post("/api/chat", json=payload)
-        response.raise_for_status()
-        data = response.json()
-        return data["message"]["content"]
-
-    def list_models(self) -> list[str]:
-        """List available models on the ollama instance."""
-        response = self._client.get("/api/tags")
-        response.raise_for_status()
-        return [m["name"] for m in response.json().get("models", [])]
-
-    def __enter__(self) -> Self:
-        """Enter the context manager."""
-        return self
-
-    def __exit__(self, *args: object) -> None:
-        """Close the HTTP client on exit."""
-        self.close()
-
-    def close(self) -> None:
-        """Close the HTTP client."""
-        self._client.close()
--- a/python/signal_bot/main.py
+++ b/python/signal_bot/main.py
@@ -1,231 +0,0 @@
-"""Signal command and control bot — main entry point."""
-
-from __future__ import annotations
-
-import logging
-from os import getenv
-from typing import Annotated
-
-import typer
-from sqlalchemy.orm import Session
-from tenacity import before_sleep_log, retry, stop_after_attempt, wait_exponential
-
-from python.common import configure_logger, utcnow
-from python.orm.common import get_postgres_engine
-from python.orm.richie.dead_letter_message import DeadLetterMessage
-from python.signal_bot.commands.inventory import handle_inventory_update
-from python.signal_bot.device_registry import DeviceRegistry
-from python.signal_bot.llm_client import LLMClient
-from python.signal_bot.models import BotConfig, MessageStatus, SignalMessage
-from python.signal_bot.signal_client import SignalClient
-
-logger = logging.getLogger(__name__)
-
-
-HELP_TEXT = (
-    "Available commands:\n"
-    "  inventory <text list>  — update van inventory from a text list\n"
-    "  inventory (+ photo)    — update van inventory from a receipt photo\n"
-    "  status                 — show bot status\n"
-    "  help                   — show this help message\n"
-    "Send a receipt photo with the message 'inventory' to scan it.\n"
-)
-
-
-def help_action(
-    signal: SignalClient,
-    message: SignalMessage,
-    _llm: LLMClient,
-    _registry: DeviceRegistry,
-    _config: BotConfig,
-    _cmd: str,
-) -> None:
-    """Return the help text for the bot."""
-    signal.reply(message, HELP_TEXT)
-
-
-def status_action(
-    signal: SignalClient,
-    message: SignalMessage,
-    llm: LLMClient,
-    registry: DeviceRegistry,
-    _config: BotConfig,
-    _cmd: str,
-) -> None:
-    """Return the status of the bot."""
-    models = llm.list_models()
-    model_list = ", ".join(models[:10])
-    device_count = len(registry.list_devices())
-    signal.reply(
-        message,
-        f"Bot online.\nLLM: {llm.model}\nAvailable models: {model_list}\nKnown devices: {device_count}",
-    )
-
-
-def unknown_action(
-    signal: SignalClient,
-    message: SignalMessage,
-    _llm: LLMClient,
-    _registry: DeviceRegistry,
-    _config: BotConfig,
-    cmd: str,
-) -> None:
-    """Return an error message for an unknown command."""
-    signal.reply(message, f"Unknown command: {cmd}\n\n{HELP_TEXT}")
-
-
-def inventory_action(
-    signal: SignalClient,
-    message: SignalMessage,
-    llm: LLMClient,
-    _registry: DeviceRegistry,
-    config: BotConfig,
-    _cmd: str,
-) -> None:
-    """Process an inventory update."""
-    handle_inventory_update(message, signal, llm, config.inventory_api_url)
-
-
-def dispatch(
-    message: SignalMessage,
-    signal: SignalClient,
-    llm: LLMClient,
-    registry: DeviceRegistry,
-    config: BotConfig,
-) -> None:
-    """Route an incoming message to the right command handler."""
-    source = message.source
-
-    if not registry.is_verified(source) or not registry.has_safety_number(source):
-        logger.info(f"Device {source} not verified, ignoring message")
-        return
-
-    text = message.message.strip()
-    parts = text.split()
-
-    if not parts and not message.attachments:
-        return
-
-    cmd = parts[0].lower() if parts else ""
-
-    commands = {
-        "help": help_action,
-        "status": status_action,
-        "inventory": inventory_action,
-    }
-    logger.info(f"f{source=} running {cmd=} with {message=}")
-    action = commands.get(cmd)
-    if action is None:
-        if message.attachments:
-            action = inventory_action
-            cmd = "inventory"
-        else:
-            return
-
-    action(signal, message, llm, registry, config, cmd)
-
-
-def _process_message(
-    message: SignalMessage,
-    signal: SignalClient,
-    llm: LLMClient,
-    registry: DeviceRegistry,
-    config: BotConfig,
-) -> None:
-    """Process a single message, sending it to the dead letter queue after repeated failures."""
-    max_attempts = config.max_message_attempts
-    for attempt in range(1, max_attempts + 1):
-        try:
-            safety_number = signal.get_safety_number(message.source)
-            registry.record_contact(message.source, safety_number)
-            dispatch(message, signal, llm, registry, config)
-        except Exception:
-            logger.exception(f"Failed to process message (attempt {attempt}/{max_attempts})")
-        else:
-            return
-
-    logger.error(f"Message from {message.source} failed {max_attempts} times, sending to dead letter queue")
-    with Session(config.engine) as session:
-        session.add(
-            DeadLetterMessage(
-                source=message.source,
-                message=message.message,
-                received_at=utcnow(),
-                status=MessageStatus.UNPROCESSED,
-            )
-        )
-        session.commit()
-
-
-def run_loop(
-    config: BotConfig,
-    signal: SignalClient,
-    llm: LLMClient,
-    registry: DeviceRegistry,
-) -> None:
-    """Listen for messages via WebSocket, reconnecting on failure."""
-    logger.info("Bot started — listening via WebSocket")
-
-    @retry(
-        stop=stop_after_attempt(config.max_retries),
-        wait=wait_exponential(multiplier=config.reconnect_delay, max=config.max_reconnect_delay),
-        before_sleep=before_sleep_log(logger, logging.WARNING),
-        reraise=True,
-    )
-    def _listen() -> None:
-        for message in signal.listen():
-            logger.info(f"Message from {message.source}: {message.message[:80]}")
-            _process_message(message, signal, llm, registry, config)
-
-    try:
-        _listen()
-    except Exception:
-        logger.critical("Max retries exceeded, shutting down")
-        raise
-
-
-def main(
-    log_level: Annotated[str, typer.Option()] = "INFO",
-    llm_timeout: Annotated[int, typer.Option()] = 600,
-) -> None:
-    """Run the Signal command and control bot."""
-    configure_logger(log_level)
-    signal_api_url = getenv("SIGNAL_API_URL")
-    phone_number = getenv("SIGNAL_PHONE_NUMBER")
-    inventory_api_url = getenv("INVENTORY_API_URL")
-
-    if signal_api_url is None:
-        error = "SIGNAL_API_URL environment variable not set"
-        raise ValueError(error)
-    if phone_number is None:
-        error = "SIGNAL_PHONE_NUMBER environment variable not set"
-        raise ValueError(error)
-    if inventory_api_url is None:
-        error = "INVENTORY_API_URL environment variable not set"
-        raise ValueError(error)
-
-    engine = get_postgres_engine(name="SIGNALBOT")
-    config = BotConfig(
-        signal_api_url=signal_api_url,
-        phone_number=phone_number,
-        inventory_api_url=inventory_api_url,
-        engine=engine,
-    )
-
-    llm_host = getenv("LLM_HOST")
-    llm_model = getenv("LLM_MODEL", "qwen3-vl:32b")
-    llm_port = int(getenv("LLM_PORT", "11434"))
-    if llm_host is None:
-        error = "LLM_HOST environment variable not set"
-        raise ValueError(error)
-
-    with (
-        SignalClient(config.signal_api_url, config.phone_number) as signal,
-        LLMClient(model=llm_model, host=llm_host, port=llm_port, timeout=llm_timeout) as llm,
-    ):
-        registry = DeviceRegistry(signal, engine)
-        run_loop(config, signal, llm, registry)
-
-
-if __name__ == "__main__":
-    typer.run(main)
--- a/python/signal_bot/models.py
+++ b/python/signal_bot/models.py
@@ -1,86 +0,0 @@
-"""Models for the Signal command and control bot."""
-
-from __future__ import annotations
-
-from datetime import datetime  # noqa: TC003 - pydantic needs this at runtime
-from enum import StrEnum
-from typing import Any
-
-from pydantic import BaseModel, ConfigDict
-from sqlalchemy.engine import Engine  # noqa: TC002 - pydantic needs this at runtime
-
-
-class TrustLevel(StrEnum):
-    """Device trust level."""
-
-    VERIFIED = "verified"
-    UNVERIFIED = "unverified"
-    BLOCKED = "blocked"
-
-
-class MessageStatus(StrEnum):
-    """Dead letter queue message status."""
-
-    UNPROCESSED = "unprocessed"
-    PROCESSED = "processed"
-
-
-class Device(BaseModel):
-    """A registered device tracked by safety number."""
-
-    phone_number: str
-    safety_number: str
-    trust_level: TrustLevel = TrustLevel.UNVERIFIED
-    first_seen: datetime
-    last_seen: datetime
-
-
-class SignalMessage(BaseModel):
-    """An incoming Signal message."""
-
-    source: str
-    timestamp: int
-    message: str = ""
-    attachments: list[str] = []
-    group_id: str | None = None
-    is_receipt: bool = False
-
-
-class SignalEnvelope(BaseModel):
-    """Raw envelope from signal-cli-rest-api."""
-
-    envelope: dict[str, Any]
-    account: str | None = None
-
-
-class InventoryItem(BaseModel):
-    """An item in the van inventory."""
-
-    name: str
-    quantity: float = 1
-    unit: str = "each"
-    category: str = ""
-    notes: str = ""
-
-
-class InventoryUpdate(BaseModel):
-    """Result of processing an inventory update."""
-
-    items: list[InventoryItem] = []
-    raw_response: str = ""
-    source_type: str = ""  # "receipt_photo" or "text_list"
-
-
-class BotConfig(BaseModel):
-    """Top-level bot configuration."""
-
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
-    signal_api_url: str
-    phone_number: str
-    inventory_api_url: str
-    engine: Engine
-    reconnect_delay: int = 5
-    max_reconnect_delay: int = 300
-    max_retries: int = 10
-    max_message_attempts: int = 3
--- a/python/signal_bot/signal_client.py
+++ b/python/signal_bot/signal_client.py
@@ -1,141 +0,0 @@
-"""Client for the signal-cli-rest-api."""
-
-from __future__ import annotations
-
-import json
-import logging
-from typing import TYPE_CHECKING, Any, Self
-
-import httpx
-import websockets.sync.client
-
-if TYPE_CHECKING:
-    from collections.abc import Generator
-
-from python.signal_bot.models import SignalMessage
-
-logger = logging.getLogger(__name__)
-
-
-def _parse_envelope(envelope: dict[str, Any]) -> SignalMessage | None:
-    """Parse a signal-cli envelope into a SignalMessage, or None if not a data message."""
-    data_message = envelope.get("dataMessage")
-    if not data_message:
-        return None
-
-    attachment_ids = [att["id"] for att in data_message.get("attachments", []) if "id" in att]
-
-    group_info = data_message.get("groupInfo")
-    group_id = group_info.get("groupId") if group_info else None
-
-    return SignalMessage(
-        source=envelope.get("source", ""),
-        timestamp=envelope.get("timestamp", 0),
-        message=data_message.get("message", "") or "",
-        attachments=attachment_ids,
-        group_id=group_id,
-    )
-
-
-class SignalClient:
-    """Communicate with signal-cli-rest-api.
-
-    Args:
-        base_url: URL of the signal-cli-rest-api (e.g. http://localhost:8989).
-        phone_number: The registered phone number to send/receive as.
-    """
-
-    def __init__(self, base_url: str, phone_number: str) -> None:
-        self.base_url = base_url.rstrip("/")
-        self.phone_number = phone_number
-        self._client = httpx.Client(base_url=self.base_url, timeout=30)
-
-    def _ws_url(self) -> str:
-        """Build the WebSocket URL from the base HTTP URL."""
-        url = self.base_url.replace("http://", "ws://").replace("https://", "wss://")
-        return f"{url}/v1/receive/{self.phone_number}"
-
-    def listen(self) -> Generator[SignalMessage]:
-        """Connect via WebSocket and yield messages as they arrive."""
-        ws_url = self._ws_url()
-        logger.info(f"Connecting to WebSocket: {ws_url}")
-
-        with websockets.sync.client.connect(ws_url) as ws:
-            for raw in ws:
-                try:
-                    data = json.loads(raw)
-                    envelope = data.get("envelope", {})
-                    message = _parse_envelope(envelope)
-                    if message:
-                        yield message
-                except json.JSONDecodeError:
-                    logger.warning(f"Non-JSON WebSocket frame: {raw[:200]}")
-
-    def send(self, recipient: str, message: str) -> None:
-        """Send a text message."""
-        payload = {
-            "message": message,
-            "number": self.phone_number,
-            "recipients": [recipient],
-        }
-        response = self._client.post("/v2/send", json=payload)
-        response.raise_for_status()
-
-    def send_to_group(self, group_id: str, message: str) -> None:
-        """Send a message to a group."""
-        payload = {
-            "message": message,
-            "number": self.phone_number,
-            "recipients": [group_id],
-        }
-        response = self._client.post("/v2/send", json=payload)
-        response.raise_for_status()
-
-    def get_attachment(self, attachment_id: str) -> bytes:
-        """Download an attachment by ID."""
-        response = self._client.get(f"/v1/attachments/{attachment_id}")
-        response.raise_for_status()
-        return response.content
-
-    def get_identities(self) -> list[dict[str, Any]]:
-        """List known identities and their trust levels."""
-        response = self._client.get(f"/v1/identities/{self.phone_number}")
-        response.raise_for_status()
-        return response.json()
-
-    def get_safety_number(self, phone_number: str) -> str | None:
-        """Look up the safety number for a contact from signal-cli's local store."""
-        for identity in self.get_identities():
-            if identity.get("number") == phone_number:
-                return identity.get("safety_number", identity.get("fingerprint", ""))
-        return None
-
-    def trust_identity(self, number_to_trust: str, *, trust_all_known_keys: bool = False) -> None:
-        """Trust an identity (verify safety number)."""
-        payload: dict[str, Any] = {}
-        if trust_all_known_keys:
-            payload["trust_all_known_keys"] = True
-        response = self._client.put(
-            f"/v1/identities/{self.phone_number}/trust/{number_to_trust}",
-            json=payload,
-        )
-        response.raise_for_status()
-
-    def reply(self, message: SignalMessage, text: str) -> None:
-        """Reply to a message, routing to group or individual."""
-        if message.group_id:
-            self.send_to_group(message.group_id, text)
-        else:
-            self.send(message.source, text)
-
-    def __enter__(self) -> Self:
-        """Enter the context manager."""
-        return self
-
-    def __exit__(self, *args: object) -> None:
-        """Close the HTTP client on exit."""
-        self.close()
-
-    def close(self) -> None:
-        """Close the HTTP client."""
-        self._client.close()
--- a/python/splendor/bot.py
+++ b/python/splendor/bot.py
@@ -34,6 +34,11 @@ def can_bot_afford(player: PlayerState, card: Card) -> bool:
    return True


+_BUY_PROBABILITY = 0.5
+_RESERVE_PROBABILITY = 0.2
+_TAKE_DOUBLE_PROBABILITY = 0.5
+
+
 class RandomBot(Strategy):
    """Dumb bot that follows rules but doesn't think."""

@@ -48,19 +53,19 @@ class RandomBot(Strategy):
            for idx, card in enumerate(row):
                if can_bot_afford(player, card):
                    affordable.append((tier, idx))
-        if affordable and random.random() < 0.5:
+        if affordable and random.random() < _BUY_PROBABILITY:
            tier, idx = random.choice(affordable)
            return BuyCard(tier=tier, index=idx)

-        if random.random() < 0.2:
+        if random.random() < _RESERVE_PROBABILITY:
            tier = random.choice([1, 2, 3])
            row = game.table_by_tier.get(tier, [])
            if row:
                idx = random.randrange(len(row))
                return ReserveCard(tier=tier, index=idx, from_deck=False)

-        if random.random() < 0.5:
-            colors_for_double = [c for c in BASE_COLORS if game.bank[c] >= 4]
+        if random.random() < _TAKE_DOUBLE_PROBABILITY:
+            colors_for_double = [c for c in BASE_COLORS if game.bank[c] >= game.config.minimum_tokens_to_buy_2]
            if colors_for_double:
                return TakeDouble(color=random.choice(colors_for_double))

@@ -137,16 +142,16 @@ class PersonalizedBot2(Strategy):
            return BuyCardReserved(index=index)

        colors_for_diff = [c for c in BASE_COLORS if game.bank[c] > 0]
-        if len(colors_for_diff) >= 3:
+        if len(colors_for_diff) >= game.config.max_token_take:
            random.shuffle(colors_for_diff)
-            return TakeDifferent(colors=colors_for_diff[:3])
+            return TakeDifferent(colors=colors_for_diff[: game.config.max_token_take])

        for tier in tiers:
            len_deck = len(game.decks_by_tier[tier])
            if len_deck:
                return ReserveCard(tier=tier, index=None, from_deck=True)

-        return TakeDifferent(colors=colors_for_diff[:3])
+        return TakeDifferent(colors=colors_for_diff[: game.config.max_token_take])

    def choose_discard(
        self,
@@ -179,7 +184,7 @@ def buy_card(game: GameState, player: PlayerState) -> Action | None:
 def take_tokens(game: GameState) -> Action | None:
    """Take tokens."""
    colors_for_diff = [color for color in BASE_COLORS if game.bank[color] > 0]
-    if len(colors_for_diff) >= 3:
+    if len(colors_for_diff) >= game.config.max_token_take:
        random.shuffle(colors_for_diff)
        return TakeDifferent(colors=colors_for_diff[: game.config.max_token_take])
    return None
@@ -204,16 +209,16 @@ class PersonalizedBot3(Strategy):
            return action

        colors_for_diff = [color for color in BASE_COLORS if game.bank[color] > 0]
-        if len(colors_for_diff) >= 3:
+        if len(colors_for_diff) >= game.config.max_token_take:
            random.shuffle(colors_for_diff)
-            return TakeDifferent(colors=colors_for_diff[:3])
+            return TakeDifferent(colors=colors_for_diff[: game.config.max_token_take])

        for tier in (1, 2, 3):
            len_deck = len(game.decks_by_tier[tier])
            if len_deck:
                return ReserveCard(tier=tier, index=None, from_deck=True)

-        return TakeDifferent(colors=colors_for_diff[:3])
+        return TakeDifferent(colors=colors_for_diff[: game.config.max_token_take])

    def choose_discard(
        self,
@@ -242,12 +247,13 @@ class PersonalizedBot4(Strategy):
        """Initialize the bot."""
        super().__init__(name=name)

-    def filter_actions(self, actions: list[Action]) -> list[Action]:
+    def filter_actions(self, actions: list[Action], max_token_take: int) -> list[Action]:
        """Filter actions to only take different."""
        return [
            action
            for action in actions
-            if (isinstance(action, TakeDifferent) and len(action.colors) == 3) or not isinstance(action, TakeDifferent)
+            if (isinstance(action, TakeDifferent) and len(action.colors) == max_token_take)
+            or not isinstance(action, TakeDifferent)
        ]

    def choose_action(self, game: GameState, player: PlayerState) -> Action | None:
@@ -255,7 +261,7 @@ class PersonalizedBot4(Strategy):
        legal_actions = get_legal_actions(game, player)
        print(len(legal_actions))

-        good_actions = self.filter_actions(legal_actions)
+        good_actions = self.filter_actions(legal_actions, game.config.max_token_take)
        print(len(good_actions))

        print(good_actions)
@@ -267,16 +273,16 @@ class PersonalizedBot4(Strategy):
            return action

        colors_for_diff = [color for color in BASE_COLORS if game.bank[color] > 0]
-        if len(colors_for_diff) >= 3:
+        if len(colors_for_diff) >= game.config.max_token_take:
            random.shuffle(colors_for_diff)
-            return TakeDifferent(colors=colors_for_diff[:3])
+            return TakeDifferent(colors=colors_for_diff[: game.config.max_token_take])

        for tier in (1, 2, 3):
            len_deck = len(game.decks_by_tier[tier])
            if len_deck:
                return ReserveCard(tier=tier, index=None, from_deck=True)

-        return TakeDifferent(colors=colors_for_diff[:3])
+        return TakeDifferent(colors=colors_for_diff[: game.config.max_token_take])

    def choose_discard(
        self,
--- a/python/splendor/human.py
+++ b/python/splendor/human.py
@@ -407,7 +407,7 @@ class ActionApp(App[None]):

    def _cmd_2(self, parts: list[str]) -> str | None:
        """Take two of the same color."""
-        if len(parts) < 2:
+        if len(parts) < 2:  # noqa: PLR2004
            return "Usage: 2 <color>"
        color = parse_color_token(parts[1])
        if self.game.bank[color] < self.game.config.minimum_tokens_to_buy_2:
@@ -418,7 +418,7 @@ class ActionApp(App[None]):

    def _cmd_3(self, parts: list[str]) -> str | None:
        """Buy face-up card."""
-        if len(parts) < 3:
+        if len(parts) < 3:  # noqa: PLR2004
            return "Usage: 3 <tier> <index>"
        tier = int(parts[1])
        idx = int(parts[2])
@@ -428,7 +428,7 @@ class ActionApp(App[None]):

    def _cmd_4(self, parts: list[str]) -> str | None:
        """Buy reserved card."""
-        if len(parts) < 2:
+        if len(parts) < 2:  # noqa: PLR2004
            return "Usage: 4 <reserved_index>"
        idx = int(parts[1])
        if not (0 <= idx < len(self.player.reserved)):
@@ -439,7 +439,7 @@ class ActionApp(App[None]):

    def _cmd_5(self, parts: list[str]) -> str | None:
        """Reserve face-up card."""
-        if len(parts) < 3:
+        if len(parts) < 3:  # noqa: PLR2004
            return "Usage: 5 <tier> <index>"
        tier = int(parts[1])
        idx = int(parts[2])
@@ -449,7 +449,7 @@ class ActionApp(App[None]):

    def _cmd_6(self, parts: list[str]) -> str | None:
        """Reserve top of deck."""
-        if len(parts) < 2:
+        if len(parts) < 2:  # noqa: PLR2004
            return "Usage: 6 <tier>"
        tier = int(parts[1])
        self.result = ReserveCard(tier=tier, index=None, from_deck=True)
--- a/python/van_inventory/init.py
+++ b/python/van_inventory/init.py
@@ -1 +0,0 @@
-"""Van inventory FastAPI application."""
--- a/python/van_inventory/dependencies.py
+++ b/python/van_inventory/dependencies.py
@@ -1,16 +0,0 @@
-"""FastAPI dependencies for van inventory."""
-
-from collections.abc import Iterator
-from typing import Annotated
-
-from fastapi import Depends, Request
-from sqlalchemy.orm import Session
-
-
-def get_db(request: Request) -> Iterator[Session]:
-    """Get database session from app state."""
-    with Session(request.app.state.engine) as session:
-        yield session
-
-
-DbSession = Annotated[Session, Depends(get_db)]
--- a/python/van_inventory/main.py
+++ b/python/van_inventory/main.py
@@ -1,56 +0,0 @@
-"""FastAPI app for van inventory."""
-
-from __future__ import annotations
-
-import logging
-from contextlib import asynccontextmanager
-from pathlib import Path
-from typing import TYPE_CHECKING, Annotated
-
-import typer
-import uvicorn
-from fastapi import FastAPI
-from fastapi.staticfiles import StaticFiles
-
-from python.common import configure_logger
-from python.orm.common import get_postgres_engine
-from python.van_inventory.routers import api_router, frontend_router
-
-STATIC_DIR = Path(__file__).resolve().parent / "static"
-
-if TYPE_CHECKING:
-    from collections.abc import AsyncIterator
-
-logger = logging.getLogger(__name__)
-
-
-def create_app() -> FastAPI:
-    """Create and configure the FastAPI application."""
-
-    @asynccontextmanager
-    async def lifespan(app: FastAPI) -> AsyncIterator[None]:
-        app.state.engine = get_postgres_engine(name="VAN_INVENTORY")
-        yield
-        app.state.engine.dispose()
-
-    app = FastAPI(title="Van Inventory", lifespan=lifespan)
-    app.mount("/static", StaticFiles(directory=STATIC_DIR), name="static")
-    app.include_router(api_router)
-    app.include_router(frontend_router)
-    return app
-
-
-def serve(
-    # Intentionally binds all interfaces — this is a LAN-only van server
-    host: Annotated[str, typer.Option("--host", "-h", help="Host to bind to")] = "0.0.0.0",  # noqa: S104
-    port: Annotated[int, typer.Option("--port", "-p", help="Port to bind to")] = 8001,
-    log_level: Annotated[str, typer.Option("--log-level", "-l", help="Log level")] = "INFO",
-) -> None:
-    """Start the Van Inventory server."""
-    configure_logger(log_level)
-    app = create_app()
-    uvicorn.run(app, host=host, port=port)
-
-
-if __name__ == "__main__":
-    typer.run(serve)
--- a/python/van_inventory/routers/init.py
+++ b/python/van_inventory/routers/init.py
@@ -1,6 +0,0 @@
-"""Van inventory API routers."""
-
-from python.van_inventory.routers.api import router as api_router
-from python.van_inventory.routers.frontend import router as frontend_router
-
-__all__ = ["api_router", "frontend_router"]
--- a/python/van_inventory/routers/api.py
+++ b/python/van_inventory/routers/api.py
@@ -1,314 +0,0 @@
-"""Van inventory API router."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from fastapi import APIRouter, HTTPException
-from pydantic import BaseModel, Field
-from sqlalchemy import select
-from sqlalchemy.orm import selectinload
-
-from python.orm.van_inventory.models import Item, Meal, MealIngredient
-
-if TYPE_CHECKING:
-    from python.van_inventory.dependencies import DbSession
-
-
-# --- Schemas ---
-
-
-class ItemCreate(BaseModel):
-    """Schema for creating an item."""
-
-    name: str
-    quantity: float = Field(default=0, ge=0)
-    unit: str
-    category: str | None = None
-
-
-class ItemUpdate(BaseModel):
-    """Schema for updating an item."""
-
-    name: str | None = None
-    quantity: float | None = Field(default=None, ge=0)
-    unit: str | None = None
-    category: str | None = None
-
-
-class ItemResponse(BaseModel):
-    """Schema for item response."""
-
-    id: int
-    name: str
-    quantity: float
-    unit: str
-    category: str | None
-
-    model_config = {"from_attributes": True}
-
-
-class IngredientCreate(BaseModel):
-    """Schema for adding an ingredient to a meal."""
-
-    item_id: int
-    quantity_needed: float = Field(gt=0)
-
-
-class MealCreate(BaseModel):
-    """Schema for creating a meal."""
-
-    name: str
-    instructions: str | None = None
-    ingredients: list[IngredientCreate] = []
-
-
-class MealUpdate(BaseModel):
-    """Schema for updating a meal."""
-
-    name: str | None = None
-    instructions: str | None = None
-
-
-class IngredientResponse(BaseModel):
-    """Schema for ingredient response."""
-
-    item_id: int
-    item_name: str
-    quantity_needed: float
-    unit: str
-
-    model_config = {"from_attributes": True}
-
-
-class MealResponse(BaseModel):
-    """Schema for meal response."""
-
-    id: int
-    name: str
-    instructions: str | None
-    ingredients: list[IngredientResponse] = []
-
-    model_config = {"from_attributes": True}
-
-    @classmethod
-    def from_meal(cls, meal: Meal) -> MealResponse:
-        """Build a MealResponse from an ORM Meal with loaded ingredients."""
-        return cls(
-            id=meal.id,
-            name=meal.name,
-            instructions=meal.instructions,
-            ingredients=[
-                IngredientResponse(
-                    item_id=mi.item_id,
-                    item_name=mi.item.name,
-                    quantity_needed=mi.quantity_needed,
-                    unit=mi.item.unit,
-                )
-                for mi in meal.ingredients
-            ],
-        )
-
-
-class ShoppingItem(BaseModel):
-    """An item needed for a meal that is short on stock."""
-
-    item_name: str
-    unit: str
-    needed: float
-    have: float
-    short: float
-
-
-class MealAvailability(BaseModel):
-    """Availability status for a meal."""
-
-    meal_id: int
-    meal_name: str
-    can_make: bool
-    missing: list[ShoppingItem] = []
-
-
-# --- Routes ---
-
-router = APIRouter(prefix="/api", tags=["van_inventory"])
-
-
-# Items
-
-
-@router.post("/items", response_model=ItemResponse)
-def create_item(item: ItemCreate, db: DbSession) -> Item:
-    """Create a new inventory item."""
-    db_item = Item(**item.model_dump())
-    db.add(db_item)
-    db.commit()
-    db.refresh(db_item)
-    return db_item
-
-
-@router.get("/items", response_model=list[ItemResponse])
-def list_items(db: DbSession) -> list[Item]:
-    """List all inventory items."""
-    return list(db.scalars(select(Item).order_by(Item.name)).all())
-
-
-@router.get("/items/{item_id}", response_model=ItemResponse)
-def get_item(item_id: int, db: DbSession) -> Item:
-    """Get an item by ID."""
-    item = db.get(Item, item_id)
-    if not item:
-        raise HTTPException(status_code=404, detail="Item not found")
-    return item
-
-
-@router.patch("/items/{item_id}", response_model=ItemResponse)
-def update_item(item_id: int, item: ItemUpdate, db: DbSession) -> Item:
-    """Update an item by ID."""
-    db_item = db.get(Item, item_id)
-    if not db_item:
-        raise HTTPException(status_code=404, detail="Item not found")
-    for key, value in item.model_dump(exclude_unset=True).items():
-        setattr(db_item, key, value)
-    db.commit()
-    db.refresh(db_item)
-    return db_item
-
-
-@router.delete("/items/{item_id}")
-def delete_item(item_id: int, db: DbSession) -> dict[str, bool]:
-    """Delete an item by ID."""
-    item = db.get(Item, item_id)
-    if not item:
-        raise HTTPException(status_code=404, detail="Item not found")
-    db.delete(item)
-    db.commit()
-    return {"deleted": True}
-
-
-# Meals
-
-
-@router.post("/meals", response_model=MealResponse)
-def create_meal(meal: MealCreate, db: DbSession) -> MealResponse:
-    """Create a new meal with optional ingredients."""
-    for ing in meal.ingredients:
-        if not db.get(Item, ing.item_id):
-            raise HTTPException(status_code=422, detail=f"Item {ing.item_id} not found")
-    db_meal = Meal(name=meal.name, instructions=meal.instructions)
-    db.add(db_meal)
-    db.flush()
-    for ing in meal.ingredients:
-        db.add(MealIngredient(meal_id=db_meal.id, item_id=ing.item_id, quantity_needed=ing.quantity_needed))
-    db.commit()
-    db_meal = db.scalar(
-        select(Meal)
-        .where(Meal.id == db_meal.id)
-        .options(selectinload(Meal.ingredients).selectinload(MealIngredient.item))
-    )
-    return MealResponse.from_meal(db_meal)
-
-
-@router.get("/meals", response_model=list[MealResponse])
-def list_meals(db: DbSession) -> list[MealResponse]:
-    """List all meals with ingredients."""
-    meals = list(
-        db.scalars(
-            select(Meal).options(selectinload(Meal.ingredients).selectinload(MealIngredient.item)).order_by(Meal.name)
-        ).all()
-    )
-    return [MealResponse.from_meal(m) for m in meals]
-
-
-@router.get("/meals/availability", response_model=list[MealAvailability])
-def check_all_meals(db: DbSession) -> list[MealAvailability]:
-    """Check which meals can be made with current inventory."""
-    meals = list(
-        db.scalars(select(Meal).options(selectinload(Meal.ingredients).selectinload(MealIngredient.item))).all()
-    )
-    return [_check_meal(m) for m in meals]
-
-
-@router.get("/meals/{meal_id}", response_model=MealResponse)
-def get_meal(meal_id: int, db: DbSession) -> MealResponse:
-    """Get a meal by ID with ingredients."""
-    meal = db.scalar(
-        select(Meal).where(Meal.id == meal_id).options(selectinload(Meal.ingredients).selectinload(MealIngredient.item))
-    )
-    if not meal:
-        raise HTTPException(status_code=404, detail="Meal not found")
-    return MealResponse.from_meal(meal)
-
-
-@router.delete("/meals/{meal_id}")
-def delete_meal(meal_id: int, db: DbSession) -> dict[str, bool]:
-    """Delete a meal by ID."""
-    meal = db.get(Meal, meal_id)
-    if not meal:
-        raise HTTPException(status_code=404, detail="Meal not found")
-    db.delete(meal)
-    db.commit()
-    return {"deleted": True}
-
-
-@router.post("/meals/{meal_id}/ingredients", response_model=MealResponse)
-def add_ingredient(meal_id: int, ingredient: IngredientCreate, db: DbSession) -> MealResponse:
-    """Add an ingredient to a meal."""
-    meal = db.get(Meal, meal_id)
-    if not meal:
-        raise HTTPException(status_code=404, detail="Meal not found")
-    if not db.get(Item, ingredient.item_id):
-        raise HTTPException(status_code=422, detail="Item not found")
-    existing = db.scalar(
-        select(MealIngredient).where(MealIngredient.meal_id == meal_id, MealIngredient.item_id == ingredient.item_id)
-    )
-    if existing:
-        raise HTTPException(status_code=409, detail="Ingredient already exists for this meal")
-    db.add(MealIngredient(meal_id=meal_id, item_id=ingredient.item_id, quantity_needed=ingredient.quantity_needed))
-    db.commit()
-    meal = db.scalar(
-        select(Meal).where(Meal.id == meal_id).options(selectinload(Meal.ingredients).selectinload(MealIngredient.item))
-    )
-    return MealResponse.from_meal(meal)
-
-
-@router.delete("/meals/{meal_id}/ingredients/{item_id}")
-def remove_ingredient(meal_id: int, item_id: int, db: DbSession) -> dict[str, bool]:
-    """Remove an ingredient from a meal."""
-    mi = db.scalar(select(MealIngredient).where(MealIngredient.meal_id == meal_id, MealIngredient.item_id == item_id))
-    if not mi:
-        raise HTTPException(status_code=404, detail="Ingredient not found")
-    db.delete(mi)
-    db.commit()
-    return {"deleted": True}
-
-
-@router.get("/meals/{meal_id}/availability", response_model=MealAvailability)
-def check_meal(meal_id: int, db: DbSession) -> MealAvailability:
-    """Check if a specific meal can be made and what's missing."""
-    meal = db.scalar(
-        select(Meal).where(Meal.id == meal_id).options(selectinload(Meal.ingredients).selectinload(MealIngredient.item))
-    )
-    if not meal:
-        raise HTTPException(status_code=404, detail="Meal not found")
-    return _check_meal(meal)
-
-
-def _check_meal(meal: Meal) -> MealAvailability:
-    missing = [
-        ShoppingItem(
-            item_name=mi.item.name,
-            unit=mi.item.unit,
-            needed=mi.quantity_needed,
-            have=mi.item.quantity,
-            short=mi.quantity_needed - mi.item.quantity,
-        )
-        for mi in meal.ingredients
-        if mi.item.quantity < mi.quantity_needed
-    ]
-    return MealAvailability(
-        meal_id=meal.id,
-        meal_name=meal.name,
-        can_make=len(missing) == 0,
-        missing=missing,
-    )
--- a/python/van_inventory/routers/frontend.py
+++ b/python/van_inventory/routers/frontend.py
@@ -1,198 +0,0 @@
-"""HTMX frontend routes for van inventory."""
-
-from __future__ import annotations
-
-from pathlib import Path
-from typing import Annotated
-
-from fastapi import APIRouter, Form, HTTPException, Request
-from fastapi.responses import HTMLResponse
-from fastapi.templating import Jinja2Templates
-from sqlalchemy import select
-from sqlalchemy.orm import selectinload
-
-from python.orm.van_inventory.models import Item, Meal, MealIngredient
-
-# FastAPI needs DbSession at runtime to resolve the Depends() annotation
-from python.van_inventory.dependencies import DbSession  # noqa: TC001
-from python.van_inventory.routers.api import _check_meal
-
-TEMPLATE_DIR = Path(__file__).resolve().parent.parent / "templates"
-templates = Jinja2Templates(directory=TEMPLATE_DIR)
-
-router = APIRouter(tags=["frontend"])
-
-
-# --- Items ---
-
-
-@router.get("/", response_class=HTMLResponse)
-def items_page(request: Request, db: DbSession) -> HTMLResponse:
-    """Render the inventory page."""
-    items = list(db.scalars(select(Item).order_by(Item.name)).all())
-    return templates.TemplateResponse(request, "items.html", {"items": items})
-
-
-@router.post("/items", response_class=HTMLResponse)
-def htmx_create_item(
-    request: Request,
-    db: DbSession,
-    name: Annotated[str, Form()],
-    quantity: Annotated[float, Form()] = 0,
-    unit: Annotated[str, Form()] = "",
-    category: Annotated[str | None, Form()] = None,
-) -> HTMLResponse:
-    """Create an item and return updated item rows."""
-    if quantity < 0:
-        raise HTTPException(status_code=422, detail="Quantity must not be negative")
-    db.add(Item(name=name, quantity=quantity, unit=unit, category=category or None))
-    db.commit()
-    items = list(db.scalars(select(Item).order_by(Item.name)).all())
-    return templates.TemplateResponse(request, "partials/item_rows.html", {"items": items})
-
-
-@router.patch("/items/{item_id}", response_class=HTMLResponse)
-def htmx_update_item(
-    request: Request,
-    item_id: int,
-    db: DbSession,
-    quantity: Annotated[float, Form()],
-) -> HTMLResponse:
-    """Update an item's quantity and return updated item rows."""
-    if quantity < 0:
-        raise HTTPException(status_code=422, detail="Quantity must not be negative")
-    item = db.get(Item, item_id)
-    if item:
-        item.quantity = quantity
-        db.commit()
-    items = list(db.scalars(select(Item).order_by(Item.name)).all())
-    return templates.TemplateResponse(request, "partials/item_rows.html", {"items": items})
-
-
-@router.delete("/items/{item_id}", response_class=HTMLResponse)
-def htmx_delete_item(request: Request, item_id: int, db: DbSession) -> HTMLResponse:
-    """Delete an item and return updated item rows."""
-    item = db.get(Item, item_id)
-    if item:
-        db.delete(item)
-        db.commit()
-    items = list(db.scalars(select(Item).order_by(Item.name)).all())
-    return templates.TemplateResponse(request, "partials/item_rows.html", {"items": items})
-
-
-# --- Meals ---
-
-
-def _load_meals(db: DbSession) -> list[Meal]:
-    return list(
-        db.scalars(
-            select(Meal).options(selectinload(Meal.ingredients).selectinload(MealIngredient.item)).order_by(Meal.name)
-        ).all()
-    )
-
-
-@router.get("/meals", response_class=HTMLResponse)
-def meals_page(request: Request, db: DbSession) -> HTMLResponse:
-    """Render the meals page."""
-    meals = _load_meals(db)
-    return templates.TemplateResponse(request, "meals.html", {"meals": meals})
-
-
-@router.post("/meals", response_class=HTMLResponse)
-def htmx_create_meal(
-    request: Request,
-    db: DbSession,
-    name: Annotated[str, Form()],
-    instructions: Annotated[str | None, Form()] = None,
-) -> HTMLResponse:
-    """Create a meal and return updated meal rows."""
-    db.add(Meal(name=name, instructions=instructions or None))
-    db.commit()
-    meals = _load_meals(db)
-    return templates.TemplateResponse(request, "partials/meal_rows.html", {"meals": meals})
-
-
-@router.delete("/meals/{meal_id}", response_class=HTMLResponse)
-def htmx_delete_meal(request: Request, meal_id: int, db: DbSession) -> HTMLResponse:
-    """Delete a meal and return updated meal rows."""
-    meal = db.get(Meal, meal_id)
-    if meal:
-        db.delete(meal)
-        db.commit()
-    meals = _load_meals(db)
-    return templates.TemplateResponse(request, "partials/meal_rows.html", {"meals": meals})
-
-
-# --- Meal detail ---
-
-
-def _load_meal(db: DbSession, meal_id: int) -> Meal | None:
-    return db.scalar(
-        select(Meal).where(Meal.id == meal_id).options(selectinload(Meal.ingredients).selectinload(MealIngredient.item))
-    )
-
-
-@router.get("/meals/{meal_id}", response_class=HTMLResponse)
-def meal_detail_page(request: Request, meal_id: int, db: DbSession) -> HTMLResponse:
-    """Render the meal detail page."""
-    meal = _load_meal(db, meal_id)
-    if not meal:
-        raise HTTPException(status_code=404, detail="Meal not found")
-    items = list(db.scalars(select(Item).order_by(Item.name)).all())
-    return templates.TemplateResponse(request, "meal_detail.html", {"meal": meal, "items": items})
-
-
-@router.post("/meals/{meal_id}/ingredients", response_class=HTMLResponse)
-def htmx_add_ingredient(
-    request: Request,
-    meal_id: int,
-    db: DbSession,
-    item_id: Annotated[int, Form()],
-    quantity_needed: Annotated[float, Form()],
-) -> HTMLResponse:
-    """Add an ingredient to a meal and return updated ingredient rows."""
-    if quantity_needed <= 0:
-        raise HTTPException(status_code=422, detail="Quantity must be positive")
-    meal = db.get(Meal, meal_id)
-    if not meal:
-        raise HTTPException(status_code=404, detail="Meal not found")
-    if not db.get(Item, item_id):
-        raise HTTPException(status_code=422, detail="Item not found")
-    existing = db.scalar(
-        select(MealIngredient).where(MealIngredient.meal_id == meal_id, MealIngredient.item_id == item_id)
-    )
-    if existing:
-        raise HTTPException(status_code=409, detail="Ingredient already exists for this meal")
-    db.add(MealIngredient(meal_id=meal_id, item_id=item_id, quantity_needed=quantity_needed))
-    db.commit()
-    meal = _load_meal(db, meal_id)
-    return templates.TemplateResponse(request, "partials/ingredient_rows.html", {"meal": meal})
-
-
-@router.delete("/meals/{meal_id}/ingredients/{item_id}", response_class=HTMLResponse)
-def htmx_remove_ingredient(
-    request: Request,
-    meal_id: int,
-    item_id: int,
-    db: DbSession,
-) -> HTMLResponse:
-    """Remove an ingredient from a meal and return updated ingredient rows."""
-    mi = db.scalar(select(MealIngredient).where(MealIngredient.meal_id == meal_id, MealIngredient.item_id == item_id))
-    if mi:
-        db.delete(mi)
-        db.commit()
-    meal = _load_meal(db, meal_id)
-    return templates.TemplateResponse(request, "partials/ingredient_rows.html", {"meal": meal})
-
-
-# --- Availability ---
-
-
-@router.get("/availability", response_class=HTMLResponse)
-def availability_page(request: Request, db: DbSession) -> HTMLResponse:
-    """Render the meal availability page."""
-    meals = list(
-        db.scalars(select(Meal).options(selectinload(Meal.ingredients).selectinload(MealIngredient.item))).all()
-    )
-    availability = [_check_meal(m) for m in meals]
-    return templates.TemplateResponse(request, "availability.html", {"availability": availability})
--- a/python/van_inventory/static/style.css
+++ b/python/van_inventory/static/style.css
@@ -1,212 +0,0 @@
-:root {
-    --neon-pink: #ff2a6d;
-    --neon-cyan: #05d9e8;
-    --neon-yellow: #f9f002;
-    --neon-purple: #d300c5;
-    --bg-dark: #0a0a0f;
-    --bg-panel: #0d0d1a;
-    --bg-input: #111128;
-    --border: #1a1a3e;
-    --text: #c0c0d0;
-    --text-dim: #8e8ea0;
-}
-
-* { box-sizing: border-box; margin: 0; padding: 0; }
-
-body {
-    font-family: 'Share Tech Mono', monospace;
-    max-width: 900px;
-    margin: 0 auto;
-    padding: 1rem;
-    background: var(--bg-dark);
-    color: var(--text);
-    position: relative;
-}
-
-/* Scanline overlay */
-body::before {
-    content: '';
-    position: fixed;
-    top: 0; left: 0; right: 0; bottom: 0;
-    background: repeating-linear-gradient(
-        0deg,
-        transparent,
-        transparent 2px,
-        rgba(0, 0, 0, 0.08) 2px,
-        rgba(0, 0, 0, 0.08) 4px
-    );
-    pointer-events: none;
-    z-index: 9999;
-}
-
-h1, h2, h3 {
-    font-family: 'Orbitron', sans-serif;
-    margin-bottom: 0.5rem;
-    color: var(--neon-cyan);
-    text-shadow: 0 0 10px rgba(5, 217, 232, 0.5), 0 0 40px rgba(5, 217, 232, 0.2);
-    text-transform: uppercase;
-    letter-spacing: 2px;
-}
-
-a { color: var(--neon-pink); text-decoration: none; transition: all 0.2s; }
-a:hover {
-    text-shadow: 0 0 8px rgba(255, 42, 109, 0.8), 0 0 20px rgba(255, 42, 109, 0.4);
-}
-
-nav {
-    display: flex;
-    gap: 1.5rem;
-    padding: 1rem 0;
-    border-bottom: 1px solid var(--border);
-    margin-bottom: 1.5rem;
-    position: relative;
-}
-nav::after {
-    content: '';
-    position: absolute;
-    bottom: -1px;
-    left: 0;
-    right: 0;
-    height: 1px;
-    background: linear-gradient(90deg, var(--neon-pink), var(--neon-cyan), var(--neon-purple));
-    opacity: 0.6;
-}
-nav a {
-    font-family: 'Orbitron', sans-serif;
-    font-weight: 700;
-    font-size: 0.85rem;
-    letter-spacing: 1px;
-    text-transform: uppercase;
-    padding: 0.3rem 0;
-    border-bottom: 2px solid transparent;
-    transition: all 0.2s;
-}
-nav a:hover {
-    border-bottom-color: var(--neon-pink);
-    text-shadow: 0 0 8px rgba(255, 42, 109, 0.8);
-}
-
-table {
-    width: 100%;
-    border-collapse: collapse;
-    margin: 1rem 0;
-    border: 1px solid var(--border);
-}
-th, td {
-    text-align: left;
-    padding: 0.6rem 0.75rem;
-    border-bottom: 1px solid var(--border);
-}
-th {
-    font-family: 'Orbitron', sans-serif;
-    color: var(--neon-cyan);
-    font-size: 0.7rem;
-    text-transform: uppercase;
-    letter-spacing: 2px;
-    background: var(--bg-panel);
-    border-bottom: 1px solid var(--neon-cyan);
-    text-shadow: 0 0 6px rgba(5, 217, 232, 0.3);
-}
-tr:hover td {
-    background: rgba(5, 217, 232, 0.03);
-}
-
-form {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 0.5rem;
-    align-items: end;
-    margin: 1rem 0;
-    padding: 1rem;
-    border: 1px solid var(--border);
-    background: var(--bg-panel);
-}
-
-input, select {
-    padding: 0.5rem 0.6rem;
-    border: 1px solid var(--border);
-    border-radius: 2px;
-    background: var(--bg-input);
-    color: var(--neon-cyan);
-    font-family: 'Share Tech Mono', monospace;
-    transition: all 0.2s;
-}
-input:focus, select:focus {
-    outline: none;
-    border-color: var(--neon-cyan);
-    box-shadow: 0 0 8px rgba(5, 217, 232, 0.3), inset 0 0 8px rgba(5, 217, 232, 0.05);
-}
-
-button {
-    padding: 0.5rem 1.2rem;
-    border: 1px solid var(--neon-pink);
-    border-radius: 2px;
-    background: transparent;
-    color: var(--neon-pink);
-    cursor: pointer;
-    font-family: 'Orbitron', sans-serif;
-    font-weight: 700;
-    font-size: 0.7rem;
-    letter-spacing: 1px;
-    text-transform: uppercase;
-    transition: all 0.2s;
-}
-button:hover {
-    background: var(--neon-pink);
-    color: var(--bg-dark);
-    box-shadow: 0 0 15px rgba(255, 42, 109, 0.5), 0 0 30px rgba(255, 42, 109, 0.2);
-}
-button.danger {
-    border-color: var(--text-dim);
-    color: var(--text-dim);
-}
-button.danger:hover {
-    border-color: var(--neon-pink);
-    background: var(--neon-pink);
-    color: var(--bg-dark);
-    box-shadow: 0 0 15px rgba(255, 42, 109, 0.5);
-}
-
-.badge {
-    display: inline-block;
-    padding: 0.2rem 0.6rem;
-    border-radius: 2px;
-    font-family: 'Orbitron', sans-serif;
-    font-size: 0.65rem;
-    font-weight: 700;
-    letter-spacing: 1px;
-    text-transform: uppercase;
-}
-.badge.yes {
-    background: rgba(5, 217, 232, 0.1);
-    color: var(--neon-cyan);
-    border: 1px solid var(--neon-cyan);
-    text-shadow: 0 0 6px rgba(5, 217, 232, 0.5);
-}
-.badge.no {
-    background: rgba(255, 42, 109, 0.1);
-    color: var(--neon-pink);
-    border: 1px solid var(--neon-pink);
-    text-shadow: 0 0 6px rgba(255, 42, 109, 0.5);
-}
-
-.missing-list { font-size: 0.85rem; color: var(--text-dim); }
-
-label {
-    font-size: 0.75rem;
-    color: var(--text-dim);
-    display: flex;
-    flex-direction: column;
-    gap: 0.2rem;
-    text-transform: uppercase;
-    letter-spacing: 1px;
-}
-
-.flash {
-    padding: 0.5rem 1rem;
-    margin: 0.5rem 0;
-    border-radius: 2px;
-    background: rgba(5, 217, 232, 0.1);
-    color: var(--neon-cyan);
-    border: 1px solid var(--neon-cyan);
-}
--- a/python/van_inventory/templates/availability.html
+++ b/python/van_inventory/templates/availability.html
@@ -1,30 +0,0 @@
-{% extends "base.html" %}
-{% block title %}What Can I Make? - Van{% endblock %}
-{% block content %}
-<h1>What Can I Make?</h1>
-
-<table>
-    <thead>
-        <tr><th>Meal</th><th>Status</th><th>Missing</th></tr>
-    </thead>
-    <tbody>
-    {% for meal in availability %}
-        <tr>
-            <td><a href="/meals/{{ meal.meal_id }}">{{ meal.meal_name }}</a></td>
-            <td>
-                {% if meal.can_make %}
-                    <span class="badge yes">Ready</span>
-                {% else %}
-                    <span class="badge no">Missing items</span>
-                {% endif %}
-            </td>
-            <td class="missing-list">
-                {% for m in meal.missing %}
-                    {{ m.item_name }}: need {{ m.short }} more {{ m.unit }}{% if not loop.last %}, {% endif %}
-                {% endfor %}
-            </td>
-        </tr>
-    {% endfor %}
-    </tbody>
-</table>
-{% endblock %}
--- a/python/van_inventory/templates/base.html
+++ b/python/van_inventory/templates/base.html
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{% block title %}Van Inventory{% endblock %}</title>
-    <script src="https://unpkg.com/htmx.org@2.0.4"></script>
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link href="https://fonts.googleapis.com/css2?family=Orbitron:wght@400;700;900&family=Share+Tech+Mono&display=swap" rel="stylesheet">
-    <link rel="stylesheet" href="/static/style.css">
-</head>
-<body>
-    <nav>
-        <a href="/">Inventory</a>
-        <a href="/meals">Meals</a>
-        <a href="/availability">What Can I Make?</a>
-    </nav>
-    {% block content %}{% endblock %}
-</body>
-</html>
--- a/python/van_inventory/templates/items.html
+++ b/python/van_inventory/templates/items.html
@@ -1,17 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Inventory - Van{% endblock %}
-{% block content %}
-<h1>Van Inventory</h1>
-
-<form hx-post="/items" hx-target="#item-list" hx-swap="innerHTML" hx-on::after-request="if(event.detail.successful) this.reset()">
-    <label>Name <input type="text" name="name" required></label>
-    <label>Qty <input type="number" name="quantity" step="any" value="0" min="0" required></label>
-    <label>Unit <input type="text" name="unit" required placeholder="lbs, cans, etc"></label>
-    <label>Category <input type="text" name="category" placeholder="optional"></label>
-    <button type="submit">Add Item</button>
-</form>
-
-<div id="item-list">
-    {% include "partials/item_rows.html" %}
-</div>
-{% endblock %}
--- a/python/van_inventory/templates/meal_detail.html
+++ b/python/van_inventory/templates/meal_detail.html
@@ -1,24 +0,0 @@
-{% extends "base.html" %}
-{% block title %}{{ meal.name }} - Van{% endblock %}
-{% block content %}
-<h1>{{ meal.name }}</h1>
-{% if meal.instructions %}<p>{{ meal.instructions }}</p>{% endif %}
-
-<h2>Ingredients</h2>
-<form hx-post="/meals/{{ meal.id }}/ingredients" hx-target="#ingredient-list" hx-swap="innerHTML" hx-on::after-request="if(event.detail.successful) this.reset()">
-    <label>Item
-        <select name="item_id" required>
-            <option value="">--</option>
-            {% for item in items %}
-            <option value="{{ item.id }}">{{ item.name }} ({{ item.unit }})</option>
-            {% endfor %}
-        </select>
-    </label>
-    <label>Qty needed <input type="number" name="quantity_needed" step="any" min="0.01" required></label>
-    <button type="submit">Add</button>
-</form>
-
-<div id="ingredient-list">
-    {% include "partials/ingredient_rows.html" %}
-</div>
-{% endblock %}
--- a/python/van_inventory/templates/meals.html
+++ b/python/van_inventory/templates/meals.html
@@ -1,15 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Meals - Van{% endblock %}
-{% block content %}
-<h1>Meals</h1>
-
-<form hx-post="/meals" hx-target="#meal-list" hx-swap="innerHTML" hx-on::after-request="if(event.detail.successful) this.reset()">
-    <label>Name <input type="text" name="name" required></label>
-    <label>Instructions <input type="text" name="instructions" placeholder="optional"></label>
-    <button type="submit">Add Meal</button>
-</form>
-
-<div id="meal-list">
-    {% include "partials/meal_rows.html" %}
-</div>
-{% endblock %}
--- a/python/van_inventory/templates/partials/ingredient_rows.html
+++ b/python/van_inventory/templates/partials/ingredient_rows.html
@@ -1,16 +0,0 @@
-<table>
-    <thead>
-        <tr><th>Item</th><th>Needed</th><th>Have</th><th>Unit</th><th></th></tr>
-    </thead>
-    <tbody>
-    {% for mi in meal.ingredients %}
-        <tr>
-            <td>{{ mi.item.name }}</td>
-            <td>{{ mi.quantity_needed }}</td>
-            <td>{{ mi.item.quantity }}</td>
-            <td>{{ mi.item.unit }}</td>
-            <td><button class="danger" hx-delete="/meals/{{ meal.id }}/ingredients/{{ mi.item_id }}" hx-target="#ingredient-list" hx-swap="innerHTML" hx-confirm="Remove {{ mi.item.name }}?">X</button></td>
-        </tr>
-    {% endfor %}
-    </tbody>
-</table>
--- a/python/van_inventory/templates/partials/item_rows.html
+++ b/python/van_inventory/templates/partials/item_rows.html
@@ -1,21 +0,0 @@
-<table>
-    <thead>
-        <tr><th>Name</th><th>Qty</th><th>Unit</th><th>Category</th><th></th></tr>
-    </thead>
-    <tbody>
-    {% for item in items %}
-        <tr>
-            <td>{{ item.name }}</td>
-            <td>
-                <form hx-patch="/items/{{ item.id }}" hx-target="#item-list" hx-swap="innerHTML" style="display:inline; margin:0;">
-                    <input type="number" name="quantity" value="{{ item.quantity }}" step="any" min="0" style="width:5rem">
-                    <button type="submit" style="padding:0.2rem 0.5rem; font-size:0.8rem;">Update</button>
-                </form>
-            </td>
-            <td>{{ item.unit }}</td>
-            <td>{{ item.category or "" }}</td>
-            <td><button class="danger" hx-delete="/items/{{ item.id }}" hx-target="#item-list" hx-swap="innerHTML" hx-confirm="Delete {{ item.name }}?">X</button></td>
-        </tr>
-    {% endfor %}
-    </tbody>
-</table>
--- a/python/van_inventory/templates/partials/meal_rows.html
+++ b/python/van_inventory/templates/partials/meal_rows.html
@@ -1,15 +0,0 @@
-<table>
-    <thead>
-        <tr><th>Name</th><th>Ingredients</th><th>Instructions</th><th></th></tr>
-    </thead>
-    <tbody>
-    {% for meal in meals %}
-        <tr>
-            <td><a href="/meals/{{ meal.id }}">{{ meal.name }}</a></td>
-            <td>{{ meal.ingredients | length }}</td>
-            <td>{{ (meal.instructions or "")[:50] }}</td>
-            <td><button class="danger" hx-delete="/meals/{{ meal.id }}" hx-target="#meal-list" hx-swap="innerHTML" hx-confirm="Delete {{ meal.name }}?">X</button></td>
-        </tr>
-    {% endfor %}
-    </tbody>
-</table>
--- a/python/van_weather/main.py
+++ b/python/van_weather/main.py
@@ -1,13 +1,13 @@
 """Van weather service - fetches weather with masked GPS for privacy."""

 import logging
+import time
 from datetime import UTC, datetime
 from typing import Annotated, Any

 import requests
 import typer
 from apscheduler.schedulers.blocking import BlockingScheduler
-from tenacity import before_sleep_log, retry, stop_after_attempt, wait_fixed

 from python.common import configure_logger
 from python.van_weather.models import Config, DailyForecast, HourlyForecast, Weather
@@ -29,25 +29,15 @@ CONDITION_MAP = {
 logger = logging.getLogger(__name__)


-@retry(
-    stop=stop_after_attempt(3),
-    wait=wait_fixed(5),
-    before_sleep=before_sleep_log(logger, logging.WARNING),
-    reraise=True,
-)
 def get_ha_state(url: str, token: str, entity_id: str) -> float:
-    """Get numeric state from Home Asasistant entity."""
+    """Get numeric state from Home Assistant entity."""
    response = requests.get(
        f"{url}/api/states/{entity_id}",
        headers={"Authorization": f"Bearer {token}"},
        timeout=30,
    )
    response.raise_for_status()
-    state = response.json()["state"]
-    if state in ("unavailable", "unknown"):
-        error = f"{entity_id} is {state}"
-        raise ValueError(error)
-    return float(state)
+    return float(response.json()["state"])


 def parse_daily_forecast(data: dict[str, dict[str, Any]]) -> list[DailyForecast]:
@@ -65,9 +55,6 @@ def parse_daily_forecast(data: dict[str, dict[str, Any]]) -> list[DailyForecast]
                    temperature=day.get("temperatureHigh"),
                    templow=day.get("temperatureLow"),
                    precipitation_probability=day.get("precipProbability"),
-                    moon_phase=day.get("moonPhase"),
-                    wind_gust=day.get("windGust"),
-                    cloud_cover=day.get("cloudCover"),
                )
            )

@@ -93,12 +80,6 @@ def parse_hourly_forecast(data: dict[str, dict[str, Any]]) -> list[HourlyForecas
    return hourly_forecasts


-@retry(
-    stop=stop_after_attempt(3),
-    wait=wait_fixed(5),
-    before_sleep=before_sleep_log(logger, logging.WARNING),
-    reraise=True,
-)
 def fetch_weather(api_key: str, lat: float, lon: float) -> Weather:
    """Fetch weather from Pirate Weather API."""
    url = f"https://api.pirateweather.net/forecast/{api_key}/{lat},{lon}"
@@ -121,25 +102,29 @@ def fetch_weather(api_key: str, lat: float, lon: float) -> Weather:
        summary=current.get("summary"),
        pressure=current.get("pressure"),
        visibility=current.get("visibility"),
-        uv_index=current.get("uvIndex"),
-        ozone=current.get("ozone"),
-        nearest_storm_distance=current.get("nearestStormDistance"),
-        nearest_storm_bearing=current.get("nearestStormBearing"),
-        precip_probability=current.get("precipProbability"),
-        cloud_cover=current.get("cloudCover"),
        daily_forecasts=daily_forecasts,
        hourly_forecasts=hourly_forecasts,
    )


-@retry(
-    stop=stop_after_attempt(3),
-    wait=wait_fixed(5),
-    before_sleep=before_sleep_log(logger, logging.WARNING),
-    reraise=True,
-)
 def post_to_ha(url: str, token: str, weather: Weather) -> None:
    """Post weather data to Home Assistant as sensor entities."""
+    max_retries = 6
+    retry_delay = 10
+
+    for attempt in range(1, max_retries + 1):
+        try:
+            _post_weather_data(url, token, weather)
+        except requests.RequestException:
+            if attempt == max_retries:
+                logger.exception(f"Failed to post weather to HA after {max_retries} attempts")
+                return
+            logger.warning(f"Post to HA failed (attempt {attempt}/{max_retries}), retrying in {retry_delay}s")
+            time.sleep(retry_delay)
+
+
+def _post_weather_data(url: str, token: str, weather: Weather) -> None:
+    """Post all weather data to Home Assistant. Raises on failure."""
    headers = {"Authorization": f"Bearer {token}"}

    # Post current weather as individual sensors
@@ -176,30 +161,6 @@ def post_to_ha(url: str, token: str, weather: Weather) -> None:
            "state": weather.visibility,
            "attributes": {"unit_of_measurement": "mi"},
        },
-        "sensor.van_weather_uv_index": {
-            "state": weather.uv_index,
-            "attributes": {"friendly_name": "Van Weather UV Index", "icon": "mdi:sun-wireless"},
-        },
-        "sensor.van_weather_ozone": {
-            "state": weather.ozone,
-            "attributes": {"unit_of_measurement": "DU", "icon": "mdi:earth"},
-        },
-        "sensor.van_weather_nearest_storm_distance": {
-            "state": weather.nearest_storm_distance,
-            "attributes": {"unit_of_measurement": "mi", "icon": "mdi:weather-lightning"},
-        },
-        "sensor.van_weather_nearest_storm_bearing": {
-            "state": weather.nearest_storm_bearing,
-            "attributes": {"unit_of_measurement": "°", "icon": "mdi:weather-lightning"},
-        },
-        "sensor.van_weather_precip_probability": {
-            "state": int((weather.precip_probability or 0) * 100),
-            "attributes": {"unit_of_measurement": "%", "icon": "mdi:weather-rainy"},
-        },
-        "sensor.van_weather_cloud_cover": {
-            "state": int((weather.cloud_cover or 0) * 100),
-            "attributes": {"unit_of_measurement": "%", "icon": "mdi:weather-cloudy"},
-        },
    }

    for entity_id, data in sensors.items():
@@ -248,7 +209,7 @@ def post_to_ha(url: str, token: str, weather: Weather) -> None:


 def update_weather(config: Config) -> None:
-    """Fetch weather using last-known location, post to HA."""
+    """Fetch GPS, mask it, get weather, post to HA."""
    lat = get_ha_state(config.ha_url, config.ha_token, config.lat_entity)
    lon = get_ha_state(config.ha_url, config.ha_token, config.lon_entity)

@@ -257,7 +218,7 @@ def update_weather(config: Config) -> None:

    logger.info(f"Masked location: {masked_lat}, {masked_lon}")

-    weather = fetch_weather(config.pirate_weather_api_key, lat, lon)
+    weather = fetch_weather(config.pirate_weather_api_key, masked_lat, masked_lon)
    logger.info(f"Weather: {weather.temperature}°F, {weather.condition}")

    post_to_ha(config.ha_url, config.ha_token, weather)
--- a/python/van_weather/models.py
+++ b/python/van_weather/models.py
@@ -11,8 +11,8 @@ class Config(BaseModel):
    ha_url: str
    ha_token: str
    pirate_weather_api_key: str
-    lat_entity: str = "sensor.van_last_known_latitude"
-    lon_entity: str = "sensor.van_last_known_longitude"
+    lat_entity: str = "sensor.gps_latitude"
+    lon_entity: str = "sensor.gps_longitude"
    mask_decimals: int = 1  # ~11km accuracy


@@ -24,9 +24,6 @@ class DailyForecast(BaseModel):
    temperature: float | None = None  # High
    templow: float | None = None  # Low
    precipitation_probability: float | None = None
-    moon_phase: float | None = None
-    wind_gust: float | None = None
-    cloud_cover: float | None = None

    @field_serializer("date_time")
    def serialize_date_time(self, date_time: datetime) -> str:
@@ -60,11 +57,5 @@ class Weather(BaseModel):
    summary: str | None = None
    pressure: float | None = None
    visibility: float | None = None
-    uv_index: float | None = None
-    ozone: float | None = None
-    nearest_storm_distance: float | None = None
-    nearest_storm_bearing: float | None = None
-    precip_probability: float | None = None
-    cloud_cover: float | None = None
    daily_forecasts: list[DailyForecast] = []
    hourly_forecasts: list[HourlyForecast] = []
--- a/shell.nix
+++ b/shell.nix
@@ -14,8 +14,6 @@
      ssh-to-age
      gnupg
      age
-
-      audiveris
    ];
  };
 }
--- a/systems/bob/llms.nix
+++ b/systems/bob/llms.nix
@@ -4,7 +4,7 @@
    host = "0.0.0.0";
    enable = true;

-    syncModels = false;
+    syncModels = true;
    loadModels = [
      "codellama:7b"
      "deepscaler:1.5b"
--- a/systems/brain/services/home_assistant/gps_location.yaml
+++ b/systems/brain/services/home_assistant/gps_location.yaml
@@ -57,30 +57,6 @@ automation:

 template:
  - sensor:
-      - name: Van Last Known Latitude
-        unique_id: van_last_known_latitude
-        unit_of_measurement: "°"
-        state: >-
-          {% set lat = states('sensor.gps_latitude')|float(none) %}
-          {% set fix = states('sensor.gps_fix')|int(0) %}
-          {% if lat is not none and fix > 0 %}
-            {{ lat }}
-          {% else %}
-            {{ this.state | default('unavailable', true) }}
-          {% endif %}
-
-      - name: Van Last Known Longitude
-        unique_id: van_last_known_longitude
-        unit_of_measurement: "°"
-        state: >-
-          {% set lon = states('sensor.gps_longitude')|float(none) %}
-          {% set fix = states('sensor.gps_fix')|int(0) %}
-          {% if lon is not none and fix > 0 %}
-            {{ lon }}
-          {% else %}
-            {{ this.state | default('unavailable', true) }}
-          {% endif %}
-
      - name: GPS Location
        unique_id: gps_location
        state: >-
--- a/systems/brain/services/home_assistant/victron_modbuss.yaml
+++ b/systems/brain/services/home_assistant/victron_modbuss.yaml
@@ -78,7 +78,7 @@ modbus:

      # GPS
      - name: GPS Latitude
-        slave: 1
+        slave: 100
        address: 2800
        input_type: holding
        data_type: int32
@@ -88,7 +88,7 @@ modbus:
        unique_id: gps_latitude

      - name: GPS Longitude
-        slave: 1
+        slave: 100
        address: 2802
        input_type: holding
        data_type: int32
@@ -98,7 +98,7 @@ modbus:
        unique_id: gps_longitude

      - name: GPS Course
-        slave: 1
+        slave: 100
        address: 2804
        input_type: holding
        data_type: uint16
@@ -109,7 +109,7 @@ modbus:
        unique_id: gps_course

      - name: GPS Speed
-        slave: 1
+        slave: 100
        address: 2805
        input_type: holding
        data_type: uint16
@@ -120,7 +120,7 @@ modbus:
        unique_id: gps_speed

      - name: GPS Fix
-        slave: 1
+        slave: 100
        address: 2806
        input_type: holding
        data_type: uint16
@@ -129,7 +129,7 @@ modbus:
        unique_id: gps_fix

      - name: GPS Satellites
-        slave: 1
+        slave: 100
        address: 2807
        input_type: holding
        data_type: uint16
@@ -138,7 +138,7 @@ modbus:
        unique_id: gps_satellites

      - name: GPS Altitude
-        slave: 1
+        slave: 100
        address: 2808
        input_type: holding
        data_type: int32
--- a/systems/brain/services/postgress.nix
+++ b/systems/brain/services/postgress.nix
@@ -11,10 +11,9 @@
    authentication = pkgs.lib.mkOverride 10 ''

      # admins
-      # These are required for the nixos postgresql setup
      local all  postgres   trust
      host  all  postgres   127.0.0.1/32    trust
-      host  all  postgres   ::1/128         trust
+      host  all  postgres   ::1/128         trust 

      local all  richie   trust
      host  all  richie   127.0.0.1/32    trust
@@ -22,8 +21,6 @@
      host  all  richie   192.168.90.1/24 trust
      host  all  richie   192.168.99.1/24 trust

-      local vaninventory vaninventory trust
-
      #type database DBuser origin-address auth-method
      local hass     hass     trust

@@ -65,13 +62,6 @@
          replication = true;
        };
      }
-      {
-        name = "vaninventory";
-        ensureDBOwnership = true;
-        ensureClauses = {
-          login = true;
-        };
-      }
      {
        name = "hass";
        ensureDBOwnership = true;
@@ -86,7 +76,6 @@
    ensureDatabases = [
      "hass"
      "richie"
-      "vaninventory"
    ];
    # Thank you NotAShelf
    # https://github.com/NotAShelf/nyx/blob/d407b4d6e5ab7f60350af61a3d73a62a5e9ac660/modules/core/roles/server/system/services/databases/postgresql.nix#L74
--- a/systems/brain/services/van_inventory.nix
+++ b/systems/brain/services/van_inventory.nix
@@ -1,50 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}:
-{
-  networking.firewall.allowedTCPPorts = [ 8001 ];
-
-  users = {
-    users.vaninventory = {
-      isSystemUser = true;
-      group = "vaninventory";
-    };
-    groups.vaninventory = { };
-  };
-
-  systemd.services.van_inventory = {
-    description = "Van Inventory API";
-    after = [
-      "network.target"
-      "postgresql.service"
-    ];
-    requires = [ "postgresql.service" ];
-    wantedBy = [ "multi-user.target" ];
-
-    environment = {
-      PYTHONPATH = "${inputs.self}/";
-      VAN_INVENTORY_DB = "vaninventory";
-      VAN_INVENTORY_USER = "vaninventory";
-      VAN_INVENTORY_HOST = "/run/postgresql";
-      VAN_INVENTORY_PORT = "5432";
-    };
-
-    serviceConfig = {
-      Type = "simple";
-      User = "vaninventory";
-      Group = "vaninventory";
-      ExecStart = "${pkgs.my_python}/bin/python -m python.van_inventory.main --host 0.0.0.0 --port 8001";
-      Restart = "on-failure";
-      RestartSec = "5s";
-      StandardOutput = "journal";
-      StandardError = "journal";
-      NoNewPrivileges = true;
-      ProtectSystem = "strict";
-      ProtectHome = "read-only";
-      PrivateTmp = true;
-      ReadOnlyPaths = [ "${inputs.self}" ];
-    };
-  };
-}
--- a/systems/jeeves/docker/signal-cli-rest-api.nix
+++ b/systems/jeeves/docker/signal-cli-rest-api.nix
@@ -6,7 +6,7 @@ in
    8989
  ];
  virtualisation.oci-containers.containers.signal_cli_rest_api = {
-    image = "bbernhard/signal-cli-rest-api:0.199-dev";
+    image = "bbernhard/signal-cli-rest-api:latest";
    ports = [
      "8989:8080"
    ];
--- a/systems/jeeves/services/postgress.nix
+++ b/systems/jeeves/services/postgress.nix
@@ -30,14 +30,11 @@ in
      local hass     hass     trust
      local gitea    gitea    trust

-      # signalbot
-      local richie  signalbot   trust
-
      # math
      local postgres  math   trust
      host  postgres  math   127.0.0.1/32    trust
-      host  postgres  math   ::1/128         trust
-      host  postgres  math   192.168.90.1/24 trust
+      host  postgres  math   ::1/128         trust  
+      host  postgres  math   192.168.90.1/24 trust 

    '';

@@ -101,12 +98,6 @@ in
          replication = true;
        };
      }
-      {
-        name = "signalbot";
-        ensureClauses = {
-          login = true;
-        };
-      }
    ];
    ensureDatabases = [
      "hass"
--- a/systems/jeeves/services/signal_bot.nix
+++ b/systems/jeeves/services/signal_bot.nix
@@ -1,56 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}:
-let
-  vars = import ../vars.nix;
-in
-{
-  users = {
-    users.signalbot = {
-      isSystemUser = true;
-      group = "signalbot";
-    };
-    groups.signalbot = { };
-  };
-
-  systemd.services.signal-bot = {
-    description = "Signal command and control bot";
-    after = [
-      "network.target"
-      "podman-signal_cli_rest_api.service"
-    ];
-    wants = [ "podman-signal_cli_rest_api.service" ];
-    wantedBy = [ "multi-user.target" ];
-
-    environment = {
-      PYTHONPATH = "${inputs.self}";
-      SIGNALBOT_DB = "richie";
-      SIGNALBOT_USER = "signalbot";
-      SIGNALBOT_HOST = "/run/postgresql";
-      SIGNALBOT_PORT = "5432";
-    };
-
-    serviceConfig = {
-      Type = "simple";
-      User = "signalbot";
-      Group = "signalbot";
-      EnvironmentFile = "${vars.secrets}/services/signal-bot";
-      ExecStart = "${pkgs.my_python}/bin/python -m python.signal_bot.main";
-      StateDirectory = "signal-bot";
-      Restart = "on-failure";
-      RestartSec = "10s";
-      StandardOutput = "journal";
-      StandardError = "journal";
-      NoNewPrivileges = true;
-      ProtectSystem = "strict";
-      ProtectHome = "read-only";
-      PrivateTmp = true;
-      ReadWritePaths = [ "/var/lib/signal-bot" ];
-      ReadOnlyPaths = [
-        "${inputs.self}"
-      ];
-    };
-  };
-}
--- a/tests/test_sheet_music_ocr.py
+++ b/tests/test_sheet_music_ocr.py
@@ -1,294 +0,0 @@
-import zipfile
-from unittest.mock import patch
-
-import httpx
-import pytest
-from typer.testing import CliRunner
-
-from python.sheet_music_ocr.audiveris import AudiverisError, find_audiveris, run_audiveris
-from python.sheet_music_ocr.main import SUPPORTED_EXTENSIONS, app, extract_mxml_from_mxl
-from python.sheet_music_ocr.review import LLMProvider, ReviewError, review_mxml
-
-runner = CliRunner()
-
-
-def make_mxl(path, xml_content=b"<score-partwise/>"):
-    """Create a minimal .mxl (ZIP) file with a MusicXML inside."""
-    with zipfile.ZipFile(path, "w") as zf:
-        zf.writestr("score.xml", xml_content)
-
-
-class TestExtractMxmlFromMxl:
-    def test_extracts_xml(self, tmp_path):
-        mxl = tmp_path / "test.mxl"
-        output = tmp_path / "output.mxml"
-        content = b"<score-partwise>hello</score-partwise>"
-        make_mxl(mxl, content)
-
-        result = extract_mxml_from_mxl(mxl, output)
-
-        assert result == output
-        assert output.read_bytes() == content
-
-    def test_skips_meta_inf(self, tmp_path):
-        mxl = tmp_path / "test.mxl"
-        output = tmp_path / "output.mxml"
-        with zipfile.ZipFile(mxl, "w") as zf:
-            zf.writestr("META-INF/container.xml", "<container/>")
-            zf.writestr("score.xml", b"<score/>")
-
-        extract_mxml_from_mxl(mxl, output)
-
-        assert output.read_bytes() == b"<score/>"
-
-    def test_raises_when_no_xml(self, tmp_path):
-        mxl = tmp_path / "test.mxl"
-        output = tmp_path / "output.mxml"
-        with zipfile.ZipFile(mxl, "w") as zf:
-            zf.writestr("readme.txt", "no xml here")
-
-        with pytest.raises(FileNotFoundError, match="No MusicXML"):
-            extract_mxml_from_mxl(mxl, output)
-
-
-class TestFindAudiveris:
-    def test_raises_when_not_found(self):
-        with (
-            patch("python.sheet_music_ocr.audiveris.shutil.which", return_value=None),
-            pytest.raises(AudiverisError, match="not found"),
-        ):
-            find_audiveris()
-
-    def test_returns_path_when_found(self):
-        with patch("python.sheet_music_ocr.audiveris.shutil.which", return_value="/usr/bin/audiveris"):
-            assert find_audiveris() == "/usr/bin/audiveris"
-
-
-class TestRunAudiveris:
-    def test_raises_on_nonzero_exit(self, tmp_path):
-        with (
-            patch("python.sheet_music_ocr.audiveris.find_audiveris", return_value="audiveris"),
-            patch("python.sheet_music_ocr.audiveris.subprocess.run") as mock_run,
-        ):
-            mock_run.return_value.returncode = 1
-            mock_run.return_value.stderr = "something went wrong"
-
-            with pytest.raises(AudiverisError, match="failed"):
-                run_audiveris(tmp_path / "input.pdf", tmp_path / "output")
-
-    def test_raises_when_no_mxl_produced(self, tmp_path):
-        output_dir = tmp_path / "output"
-        output_dir.mkdir()
-
-        with (
-            patch("python.sheet_music_ocr.audiveris.find_audiveris", return_value="audiveris"),
-            patch("python.sheet_music_ocr.audiveris.subprocess.run") as mock_run,
-        ):
-            mock_run.return_value.returncode = 0
-
-            with pytest.raises(AudiverisError, match=r"no \.mxl output"):
-                run_audiveris(tmp_path / "input.pdf", output_dir)
-
-    def test_returns_mxl_path(self, tmp_path):
-        output_dir = tmp_path / "output"
-        output_dir.mkdir()
-        mxl = output_dir / "score.mxl"
-        make_mxl(mxl)
-
-        with (
-            patch("python.sheet_music_ocr.audiveris.find_audiveris", return_value="audiveris"),
-            patch("python.sheet_music_ocr.audiveris.subprocess.run") as mock_run,
-        ):
-            mock_run.return_value.returncode = 0
-
-            result = run_audiveris(tmp_path / "input.pdf", output_dir)
-            assert result == mxl
-
-
-class TestCli:
-    def test_missing_input_file(self, tmp_path):
-        result = runner.invoke(app, ["convert", str(tmp_path / "nonexistent.pdf")])
-        assert result.exit_code == 1
-        assert "does not exist" in result.output
-
-    def test_unsupported_format(self, tmp_path):
-        bad_file = tmp_path / "music.bmp"
-        bad_file.touch()
-        result = runner.invoke(app, ["convert", str(bad_file)])
-        assert result.exit_code == 1
-        assert "Unsupported format" in result.output
-
-    def test_supported_extensions_complete(self):
-        assert ".pdf" in SUPPORTED_EXTENSIONS
-        assert ".png" in SUPPORTED_EXTENSIONS
-        assert ".jpg" in SUPPORTED_EXTENSIONS
-        assert ".jpeg" in SUPPORTED_EXTENSIONS
-        assert ".tiff" in SUPPORTED_EXTENSIONS
-
-    def test_successful_conversion(self, tmp_path):
-        input_file = tmp_path / "score.pdf"
-        input_file.touch()
-        output_file = tmp_path / "score.mxml"
-
-        mxl_path = tmp_path / "tmp_mxl" / "score.mxl"
-        mxl_path.parent.mkdir()
-        make_mxl(mxl_path, b"<score-partwise/>")
-
-        with patch("python.sheet_music_ocr.main.run_audiveris", return_value=mxl_path):
-            result = runner.invoke(app, ["convert", str(input_file), "-o", str(output_file)])
-
-        assert result.exit_code == 0
-        assert output_file.exists()
-        assert "Written" in result.output
-
-    def test_default_output_path(self, tmp_path):
-        input_file = tmp_path / "score.png"
-        input_file.touch()
-
-        mxl_path = tmp_path / "tmp_mxl" / "score.mxl"
-        mxl_path.parent.mkdir()
-        make_mxl(mxl_path)
-
-        with patch("python.sheet_music_ocr.main.run_audiveris", return_value=mxl_path):
-            result = runner.invoke(app, ["convert", str(input_file)])
-
-        assert result.exit_code == 0
-        assert (tmp_path / "score.mxml").exists()
-
-
-class TestReviewMxml:
-    def test_raises_when_no_api_key(self, tmp_path, monkeypatch):
-        mxml = tmp_path / "score.mxml"
-        mxml.write_text("<score-partwise/>")
-        monkeypatch.delenv("ANTHROPIC_API_KEY", raising=False)
-
-        with pytest.raises(ReviewError, match="ANTHROPIC_API_KEY"):
-            review_mxml(mxml, LLMProvider.CLAUDE)
-
-    def test_raises_when_no_openai_key(self, tmp_path, monkeypatch):
-        mxml = tmp_path / "score.mxml"
-        mxml.write_text("<score-partwise/>")
-        monkeypatch.delenv("OPENAI_API_KEY", raising=False)
-
-        with pytest.raises(ReviewError, match="OPENAI_API_KEY"):
-            review_mxml(mxml, LLMProvider.OPENAI)
-
-    def test_claude_success(self, tmp_path, monkeypatch):
-        mxml = tmp_path / "score.mxml"
-        mxml.write_text("<score-partwise/>")
-        monkeypatch.setenv("ANTHROPIC_API_KEY", "test-key")
-
-        corrected = "<score-partwise><part/></score-partwise>"
-        mock_response = httpx.Response(
-            200,
-            json={"content": [{"text": corrected}]},
-            request=httpx.Request("POST", "https://api.anthropic.com/v1/messages"),
-        )
-
-        with patch("python.sheet_music_ocr.review.httpx.post", return_value=mock_response):
-            result = review_mxml(mxml, LLMProvider.CLAUDE)
-
-        assert result == corrected
-
-    def test_openai_success(self, tmp_path, monkeypatch):
-        mxml = tmp_path / "score.mxml"
-        mxml.write_text("<score-partwise/>")
-        monkeypatch.setenv("OPENAI_API_KEY", "test-key")
-
-        corrected = "<score-partwise><part/></score-partwise>"
-        mock_response = httpx.Response(
-            200,
-            json={"choices": [{"message": {"content": corrected}}]},
-            request=httpx.Request("POST", "https://api.openai.com/v1/chat/completions"),
-        )
-
-        with patch("python.sheet_music_ocr.review.httpx.post", return_value=mock_response):
-            result = review_mxml(mxml, LLMProvider.OPENAI)
-
-        assert result == corrected
-
-    def test_claude_api_error(self, tmp_path, monkeypatch):
-        mxml = tmp_path / "score.mxml"
-        mxml.write_text("<score-partwise/>")
-        monkeypatch.setenv("ANTHROPIC_API_KEY", "test-key")
-
-        mock_response = httpx.Response(
-            500,
-            text="Internal Server Error",
-            request=httpx.Request("POST", "https://api.anthropic.com/v1/messages"),
-        )
-
-        with (
-            patch("python.sheet_music_ocr.review.httpx.post", return_value=mock_response),
-            pytest.raises(ReviewError, match="Claude API error"),
-        ):
-            review_mxml(mxml, LLMProvider.CLAUDE)
-
-    def test_openai_api_error(self, tmp_path, monkeypatch):
-        mxml = tmp_path / "score.mxml"
-        mxml.write_text("<score-partwise/>")
-        monkeypatch.setenv("OPENAI_API_KEY", "test-key")
-
-        mock_response = httpx.Response(
-            429,
-            text="Rate limited",
-            request=httpx.Request("POST", "https://api.openai.com/v1/chat/completions"),
-        )
-
-        with (
-            patch("python.sheet_music_ocr.review.httpx.post", return_value=mock_response),
-            pytest.raises(ReviewError, match="OpenAI API error"),
-        ):
-            review_mxml(mxml, LLMProvider.OPENAI)
-
-
-class TestReviewCli:
-    def test_missing_input_file(self, tmp_path):
-        result = runner.invoke(app, ["review", str(tmp_path / "nonexistent.mxml")])
-        assert result.exit_code == 1
-        assert "does not exist" in result.output
-
-    def test_wrong_extension(self, tmp_path):
-        bad_file = tmp_path / "score.pdf"
-        bad_file.touch()
-        result = runner.invoke(app, ["review", str(bad_file)])
-        assert result.exit_code == 1
-        assert ".mxml" in result.output
-
-    def test_successful_review(self, tmp_path, monkeypatch):
-        mxml = tmp_path / "score.mxml"
-        mxml.write_text("<score-partwise/>")
-        output = tmp_path / "corrected.mxml"
-        monkeypatch.setenv("ANTHROPIC_API_KEY", "test-key")
-
-        corrected = "<score-partwise><part/></score-partwise>"
-        mock_response = httpx.Response(
-            200,
-            json={"content": [{"text": corrected}]},
-            request=httpx.Request("POST", "https://api.anthropic.com/v1/messages"),
-        )
-
-        with patch("python.sheet_music_ocr.review.httpx.post", return_value=mock_response):
-            result = runner.invoke(app, ["review", str(mxml), "-o", str(output)])
-
-        assert result.exit_code == 0
-        assert "Reviewed" in result.output
-        assert output.read_text() == corrected
-
-    def test_overwrites_input_by_default(self, tmp_path, monkeypatch):
-        mxml = tmp_path / "score.mxml"
-        mxml.write_text("<score-partwise/>")
-        monkeypatch.setenv("ANTHROPIC_API_KEY", "test-key")
-
-        corrected = "<score-partwise><part/></score-partwise>"
-        mock_response = httpx.Response(
-            200,
-            json={"content": [{"text": corrected}]},
-            request=httpx.Request("POST", "https://api.anthropic.com/v1/messages"),
-        )
-
-        with patch("python.sheet_music_ocr.review.httpx.post", return_value=mock_response):
-            result = runner.invoke(app, ["review", str(mxml)])
-
-        assert result.exit_code == 0
-        assert mxml.read_text() == corrected
--- a/tests/test_signal_bot.py
+++ b/tests/test_signal_bot.py
@@ -1,285 +0,0 @@
-"""Tests for the Signal command and control bot."""
-
-from __future__ import annotations
-
-import json
-from datetime import timedelta
-from unittest.mock import MagicMock, patch
-
-import pytest
-from sqlalchemy import create_engine
-
-from python.orm.richie.base import RichieBase
-from python.signal_bot.commands.inventory import (
-    _format_summary,
-    parse_llm_response,
-)
-from python.signal_bot.device_registry import _BLOCKED_TTL, _DEFAULT_TTL, DeviceRegistry, _CacheEntry
-from python.signal_bot.llm_client import LLMClient
-from python.signal_bot.main import dispatch
-from python.signal_bot.models import (
-    BotConfig,
-    InventoryItem,
-    SignalMessage,
-    TrustLevel,
-)
-from python.signal_bot.signal_client import SignalClient
-
-
-class TestModels:
-    def test_trust_level_values(self):
-        assert TrustLevel.VERIFIED == "verified"
-        assert TrustLevel.UNVERIFIED == "unverified"
-        assert TrustLevel.BLOCKED == "blocked"
-
-    def test_signal_message_defaults(self):
-        msg = SignalMessage(source="+1234", timestamp=0)
-        assert msg.message == ""
-        assert msg.attachments == []
-        assert msg.group_id is None
-
-    def test_inventory_item_defaults(self):
-        item = InventoryItem(name="wrench")
-        assert item.quantity == 1
-        assert item.unit == "each"
-        assert item.category == ""
-
-
-class TestInventoryParsing:
-    def test_parse_llm_response_basic(self):
-        raw = '[{"name": "water", "quantity": 6, "unit": "gallon", "category": "supplies", "notes": ""}]'
-        items = parse_llm_response(raw)
-        assert len(items) == 1
-        assert items[0].name == "water"
-        assert items[0].quantity == 6
-        assert items[0].unit == "gallon"
-
-    def test_parse_llm_response_with_code_fence(self):
-        raw = '```json\n[{"name": "tape", "quantity": 1, "unit": "each", "category": "tools", "notes": ""}]\n```'
-        items = parse_llm_response(raw)
-        assert len(items) == 1
-        assert items[0].name == "tape"
-
-    def test_parse_llm_response_invalid_json(self):
-        with pytest.raises(json.JSONDecodeError):
-            parse_llm_response("not json at all")
-
-    def test_format_summary(self):
-        items = [InventoryItem(name="water", quantity=6, unit="gallon", category="supplies")]
-        summary = _format_summary(items)
-        assert "water" in summary
-        assert "x6" in summary
-        assert "gallon" in summary
-
-
-class TestDeviceRegistry:
-    @pytest.fixture
-    def signal_mock(self):
-        return MagicMock(spec=SignalClient)
-
-    @pytest.fixture
-    def engine(self):
-        engine = create_engine("sqlite://")
-        RichieBase.metadata.create_all(engine)
-        return engine
-
-    @pytest.fixture
-    def registry(self, signal_mock, engine):
-        return DeviceRegistry(signal_mock, engine)
-
-    def test_new_device_is_unverified(self, registry):
-        registry.record_contact("+1234", "abc123")
-        assert not registry.is_verified("+1234")
-
-    def test_verify_device(self, registry):
-        registry.record_contact("+1234", "abc123")
-        assert registry.verify("+1234")
-        assert registry.is_verified("+1234")
-
-    def test_verify_unknown_device(self, registry):
-        assert not registry.verify("+9999")
-
-    def test_block_device(self, registry):
-        registry.record_contact("+1234", "abc123")
-        assert registry.block("+1234")
-        assert not registry.is_verified("+1234")
-
-    def test_safety_number_change_resets_trust(self, registry):
-        registry.record_contact("+1234", "abc123")
-        registry.verify("+1234")
-        assert registry.is_verified("+1234")
-        registry.record_contact("+1234", "different_safety_number")
-        assert not registry.is_verified("+1234")
-
-    def test_persistence(self, signal_mock, engine):
-        reg1 = DeviceRegistry(signal_mock, engine)
-        reg1.record_contact("+1234", "abc123")
-        reg1.verify("+1234")
-
-        reg2 = DeviceRegistry(signal_mock, engine)
-        assert reg2.is_verified("+1234")
-
-    def test_list_devices(self, registry):
-        registry.record_contact("+1234", "abc")
-        registry.record_contact("+5678", "def")
-        assert len(registry.list_devices()) == 2
-
-
-class TestContactCache:
-    @pytest.fixture
-    def signal_mock(self):
-        return MagicMock(spec=SignalClient)
-
-    @pytest.fixture
-    def engine(self):
-        engine = create_engine("sqlite://")
-        RichieBase.metadata.create_all(engine)
-        return engine
-
-    @pytest.fixture
-    def registry(self, signal_mock, engine):
-        return DeviceRegistry(signal_mock, engine)
-
-    def test_second_call_uses_cache(self, registry):
-        registry.record_contact("+1234", "abc")
-        assert "+1234" in registry._contact_cache
-
-        with patch.object(registry, "engine") as mock_engine:
-            registry.record_contact("+1234", "abc")
-            mock_engine.assert_not_called()
-
-    def test_unverified_gets_default_ttl(self, registry):
-        registry.record_contact("+1234", "abc")
-        from python.common import utcnow
-
-        entry = registry._contact_cache["+1234"]
-        expected = utcnow() + _DEFAULT_TTL
-        assert abs((entry.expires - expected).total_seconds()) < 2
-        assert entry.trust_level == TrustLevel.UNVERIFIED
-        assert entry.has_safety_number is True
-
-    def test_blocked_gets_blocked_ttl(self, registry):
-        registry.record_contact("+1234", "abc")
-        registry.block("+1234")
-        from python.common import utcnow
-
-        entry = registry._contact_cache["+1234"]
-        expected = utcnow() + _BLOCKED_TTL
-        assert abs((entry.expires - expected).total_seconds()) < 2
-        assert entry.trust_level == TrustLevel.BLOCKED
-
-    def test_verify_updates_cache(self, registry):
-        registry.record_contact("+1234", "abc")
-        registry.verify("+1234")
-        entry = registry._contact_cache["+1234"]
-        assert entry.trust_level == TrustLevel.VERIFIED
-
-    def test_block_updates_cache(self, registry):
-        registry.record_contact("+1234", "abc")
-        registry.block("+1234")
-        entry = registry._contact_cache["+1234"]
-        assert entry.trust_level == TrustLevel.BLOCKED
-
-    def test_unverify_updates_cache(self, registry):
-        registry.record_contact("+1234", "abc")
-        registry.verify("+1234")
-        registry.unverify("+1234")
-        entry = registry._contact_cache["+1234"]
-        assert entry.trust_level == TrustLevel.UNVERIFIED
-
-    def test_is_verified_uses_cache(self, registry):
-        registry.record_contact("+1234", "abc")
-        registry.verify("+1234")
-        with patch.object(registry, "engine") as mock_engine:
-            assert registry.is_verified("+1234") is True
-            mock_engine.assert_not_called()
-
-    def test_has_safety_number_uses_cache(self, registry):
-        registry.record_contact("+1234", "abc")
-        with patch.object(registry, "engine") as mock_engine:
-            assert registry.has_safety_number("+1234") is True
-            mock_engine.assert_not_called()
-
-    def test_no_safety_number_cached(self, registry):
-        registry.record_contact("+1234", None)
-        with patch.object(registry, "engine") as mock_engine:
-            assert registry.has_safety_number("+1234") is False
-            mock_engine.assert_not_called()
-
-    def test_expired_cache_hits_db(self, registry):
-        registry.record_contact("+1234", "abc")
-        old = registry._contact_cache["+1234"]
-        registry._contact_cache["+1234"] = _CacheEntry(
-            expires=old.expires - timedelta(minutes=10),
-            trust_level=old.trust_level,
-            has_safety_number=old.has_safety_number,
-            safety_number=old.safety_number,
-        )
-
-        with patch("python.signal_bot.device_registry.Session") as mock_session_cls:
-            mock_session = MagicMock()
-            mock_session_cls.return_value.__enter__ = MagicMock(return_value=mock_session)
-            mock_session_cls.return_value.__exit__ = MagicMock(return_value=False)
-            mock_device = MagicMock()
-            mock_device.trust_level = TrustLevel.UNVERIFIED
-            mock_session.execute.return_value.scalar_one_or_none.return_value = mock_device
-            registry.record_contact("+1234", "abc")
-            mock_session.execute.assert_called_once()
-
-
-class TestDispatch:
-    @pytest.fixture
-    def signal_mock(self):
-        return MagicMock(spec=SignalClient)
-
-    @pytest.fixture
-    def llm_mock(self):
-        return MagicMock(spec=LLMClient)
-
-    @pytest.fixture
-    def registry_mock(self):
-        mock = MagicMock(spec=DeviceRegistry)
-        mock.is_verified.return_value = True
-        mock.has_safety_number.return_value = True
-        return mock
-
-    @pytest.fixture
-    def config(self):
-        engine = create_engine("sqlite://")
-        return BotConfig(
-            signal_api_url="http://localhost:8080",
-            phone_number="+1234567890",
-            inventory_api_url="http://localhost:9090",
-            engine=engine,
-        )
-
-    def test_unverified_device_ignored(self, signal_mock, llm_mock, registry_mock, config):
-        registry_mock.is_verified.return_value = False
-        msg = SignalMessage(source="+1234", timestamp=0, message="help")
-        dispatch(msg, signal_mock, llm_mock, registry_mock, config)
-        signal_mock.reply.assert_not_called()
-
-    def test_help_command(self, signal_mock, llm_mock, registry_mock, config):
-        msg = SignalMessage(source="+1234", timestamp=0, message="help")
-        dispatch(msg, signal_mock, llm_mock, registry_mock, config)
-        signal_mock.reply.assert_called_once()
-        assert "Available commands" in signal_mock.reply.call_args[0][1]
-
-    def test_unknown_command_ignored(self, signal_mock, llm_mock, registry_mock, config):
-        msg = SignalMessage(source="+1234", timestamp=0, message="foobar")
-        dispatch(msg, signal_mock, llm_mock, registry_mock, config)
-        signal_mock.reply.assert_not_called()
-
-    def test_non_command_message_ignored(self, signal_mock, llm_mock, registry_mock, config):
-        msg = SignalMessage(source="+1234", timestamp=0, message="hello there")
-        dispatch(msg, signal_mock, llm_mock, registry_mock, config)
-        signal_mock.reply.assert_not_called()
-
-    def test_status_command(self, signal_mock, llm_mock, registry_mock, config):
-        llm_mock.list_models.return_value = ["model1", "model2"]
-        llm_mock.model = "test:7b"
-        registry_mock.list_devices.return_value = []
-        msg = SignalMessage(source="+1234", timestamp=0, message="status")
-        dispatch(msg, signal_mock, llm_mock, registry_mock, config)
-        signal_mock.reply.assert_called_once()
-        assert "Bot online" in signal_mock.reply.call_args[0][1]
--- a/users/elise/home/gui/default.nix
+++ b/users/elise/home/gui/default.nix
@@ -12,7 +12,6 @@
    obs-studio
    obsidian
    vlc
-    qalculate-gtk
    # graphics tools
    gimp3
    xcursorgen
--- a/users/richie/home/gui/default.nix
+++ b/users/richie/home/gui/default.nix
@@ -16,7 +16,6 @@
    obsidian
    prismlauncher
    prusa-slicer
-    qalculate-gtk
    vlc
    # browser
    chromium
				`@@ -1 +0,0 @@`
				`"""Sheet music OCR tool using Audiveris."""`