From ba155b70e1a329cbd788ee58da8ad5be8c889bda Mon Sep 17 00:00:00 2001
From: anti <samuel@securejump.cl>
Date: Fri, 24 Apr 2026 16:31:10 -0400
Subject: [PATCH] fix(cli/db-reset): drive table list from SQLModel.metadata,
 not hardcoded
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The hardcoded _DB_RESET_TABLES tuple had drifted — session_profile,
smtp_targets, and webhook_subscriptions were all missing, so
`decnet db-reset --i-know-what-im-doing drop-tables` silently left
them behind. Running it on a post-webhook install then letting
SQLModel.metadata.create_all() re-create tables produced a partial
schema: old rows survived, new columns didn't land, and endpoints
500'd on the missing columns (e.g. auto_disabled_at after the
circuit breaker merge).

Replace the hardcoded list with `SQLModel.metadata.sorted_tables`,
reversed for DROP safety (children first). Any future model addition
is auto-enrolled — no manual step, no more drift.

No behavior change on reset semantics; the SET FOREIGN_KEY_CHECKS=0
fence still covers any edge case the sort order misses.
---
 decnet/cli/db.py | 48 ++++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/decnet/cli/db.py b/decnet/cli/db.py
index eb0a2179..86193967 100644
--- a/decnet/cli/db.py
+++ b/decnet/cli/db.py
@@ -8,26 +8,29 @@ from rich.table import Table
 from .utils import console, log
 
 
-_DB_RESET_TABLES: tuple[str, ...] = (
-    # Order matters for DROP TABLE: child FKs first.
-    # - attacker_behavior FK-references attackers.
-    # - decky_shards FK-references swarm_hosts.
-    # - topology_* children FK-reference topologies / lans / topology_deckies.
-    "attacker_behavior",
-    "attackers",
-    "logs",
-    "bounty",
-    "state",
-    "users",
-    "decky_shards",
-    "swarm_hosts",
-    "topology_status_events",
-    "topology_mutations",
-    "topology_edges",
-    "topology_deckies",
-    "lans",
-    "topologies",
-)
+def _decnet_tables() -> tuple[str, ...]:
+    """Every DECNET-managed table, ordered child-first for DROP safety.
+
+    Source is ``SQLModel.metadata.sorted_tables`` — the same registry that
+    drives ``create_all`` — so adding a new model automatically enrolls
+    its table in ``db-reset`` with no manual step. (Previous hardcoded
+    list drifted multiple times; ``webhook_subscriptions`` /
+    ``session_profile`` / ``smtp_targets`` all got missed.)
+
+    ``sorted_tables`` returns parent-first (topological order that makes
+    ``CREATE`` safe). For ``DROP`` we need the reverse: children first,
+    so FK constraints drop before their parents. ``SET FOREIGN_KEY_CHECKS
+    = 0`` below makes this order-insensitive for MySQL, but the reverse
+    order keeps the code honest for any backend that doesn't support
+    disabling the FK check.
+    """
+    from sqlmodel import SQLModel
+    # Importing the models package registers every table on SQLModel.metadata.
+    import decnet.web.db.models  # noqa: F401
+
+    return tuple(
+        t.name for t in reversed(SQLModel.metadata.sorted_tables)
+    )
 
 
 async def _db_reset_mysql_async(dsn: str, mode: str, confirm: bool) -> None:
@@ -39,10 +42,11 @@ async def _db_reset_mysql_async(dsn: str, mode: str, confirm: bool) -> None:
 
     db_name = urlparse(dsn).path.lstrip("/") or "(default)"
     engine = create_async_engine(dsn)
+    tables = _decnet_tables()
     try:
         rows: dict[str, int] = {}
         async with engine.connect() as conn:
-            for tbl in _DB_RESET_TABLES:
+            for tbl in tables:
                 try:
                     result = await conn.execute(text(f"SELECT COUNT(*) FROM `{tbl}`"))  # nosec B608
                     rows[tbl] = result.scalar() or 0
@@ -65,7 +69,7 @@ async def _db_reset_mysql_async(dsn: str, mode: str, confirm: bool) -> None:
 
         async with engine.begin() as conn:
             await conn.execute(text("SET FOREIGN_KEY_CHECKS = 0"))
-            for tbl in _DB_RESET_TABLES:
+            for tbl in tables:
                 if rows.get(tbl, -1) < 0:
                     continue
                 if mode == "truncate":