kirby-api 0.1.0__py3-none-any.whl

kirby/__init__.py

@@ -0,0 +1,13 @@
+"""Kirby — HERO System VTT backend API."""
+
+from importlib.metadata import PackageNotFoundError, version as _dist_version
+
+try:
+    # pyproject's [project] version is the ONE place the number lives. It was
+    # written out here too and had already drifted — the wheel said 0.1.0
+    # while the startup banner and /openapi.json both said 0.0.1.
+    __version__ = _dist_version("kirby-api")
+except PackageNotFoundError:  # pragma: no cover — source tree, never installed
+    # Not a fallback value to run on: it says it does not know rather than
+    # naming a version that would be wrong.
+    __version__ = "0+unknown"

kirby/_migrations/README

@@ -0,0 +1 @@
+Generic single-database configuration.

kirby/_migrations/alembic.ini

@@ -0,0 +1,149 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts.
+# this is typically a path given in POSIX (e.g. forward slashes)
+# format, relative to the token %(here)s which refers to the location of this
+# ini file
+script_location = %(here)s
+
+# 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_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+# Or organize into date-based subdirectories (requires recursive_version_locations = true)
+# file_template = %%(year)d/%%(month).2d/%%(day).2d_%%(hour).2d%%(minute).2d_%%(second).2d_%%(rev)s_%%(slug)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.  for multiple paths, the path separator
+# is defined by "path_separator" below.
+prepend_sys_path = .
+
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the tzdata library which can be 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 <script_location>/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 "path_separator"
+# below.
+# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions
+
+# path_separator; This indicates what character is used to split lists of file
+# paths, including version_locations and prepend_sys_path within configparser
+# files such as alembic.ini.
+# The default rendered in new alembic.ini files is "os", which uses os.pathsep
+# to provide os-dependent path splitting.
+#
+# Note that in order to support legacy alembic.ini files, this default does NOT
+# take place if path_separator is not present in alembic.ini.  If this
+# option is omitted entirely, fallback logic is as follows:
+#
+# 1. Parsing of the version_locations option falls back to using the legacy
+#    "version_path_separator" key, which if absent then falls back to the legacy
+#    behavior of splitting on spaces and/or commas.
+# 2. Parsing of the prepend_sys_path option falls back to the legacy
+#    behavior of splitting on spaces, commas, or colons.
+#
+# Valid values for path_separator are:
+#
+# path_separator = :
+# path_separator = ;
+# path_separator = space
+# path_separator = newline
+#
+# Use os.pathsep. Default configuration used for new projects.
+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
+
+# database URL.  This is consumed by the user-maintained env.py script only.
+# other means of configuring database URLs may be customized within the env.py
+# file.
+sqlalchemy.url = driver://user:pass@localhost/dbname
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks = black
+# black.type = console_scripts
+# black.entrypoint = black
+# black.options = -l 79 REVISION_SCRIPT_FILENAME
+
+# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module
+# hooks = ruff
+# ruff.type = module
+# ruff.module = ruff
+# ruff.options = check --fix REVISION_SCRIPT_FILENAME
+
+# Alternatively, use the exec runner to execute a binary found on your PATH
+# hooks = ruff
+# ruff.type = exec
+# ruff.executable = ruff
+# ruff.options = check --fix REVISION_SCRIPT_FILENAME
+
+# Logging configuration.  This is also consumed by the user-maintained
+# env.py script only.
+[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

kirby/_migrations/env.py

@@ -0,0 +1,74 @@
+"""Alembic environment — wired to Kirby's SQLAlchemy Base and settings.
+
+This directory IS the alembic environment, and it lives inside the package on
+purpose: a wheel can only carry files under a package, so `pip install
+kirby-api` + `kirby-api migrate` and a bare `alembic upgrade head` in a
+checkout run the same env.py against the same versions/ tree.
+"""
+
+from logging.config import fileConfig
+from pathlib import Path
+
+from sqlalchemy import engine_from_config, pool
+from alembic import context
+
+from kirby.shared.db import Base
+from kirby.settings import settings
+
+# Import all models so Base.metadata knows about every table.
+import kirby.auth.models  # noqa: F401
+import kirby.tenants.models  # noqa: F401
+import kirby.characters.models  # noqa: F401
+import kirby.campaigns.models  # noqa: F401
+import kirby.codex.models  # noqa: F401
+import kirby.combat.models  # noqa: F401
+import kirby.combat.random_fight.models  # noqa: F401
+
+config = context.config
+
+# Override sqlalchemy.url from our settings (env-var driven, not alembic.ini).
+config.set_main_option("sqlalchemy.url", settings.database_url)
+
+# Logging comes from the ini NEXT TO THIS FILE, never from whichever ini
+# invoked us. The repo-root alembic.ini is a two-line pointer and the
+# `kirby-api migrate` entry point builds its Config in memory with no ini at
+# all; reading `config.config_file_name` would give each of those three doors
+# a different logging setup, or a KeyError on the ones with no [formatters]
+# section. One file owns it.
+_PACKAGED_INI = Path(__file__).resolve().parent / "alembic.ini"
+if _PACKAGED_INI.is_file():
+    fileConfig(str(_PACKAGED_INI))
+
+target_metadata = Base.metadata
+
+
+def run_migrations_offline() -> None:
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online() -> None:
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section, {}),
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection, target_metadata=target_metadata
+        )
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

kirby/_migrations/script.py.mako

@@ -0,0 +1,28 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision: str = ${repr(up_revision)}
+down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
+branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
+depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    ${downgrades if downgrades else "pass"}

kirby/_migrations/versions/1b7affd8668e_initial_schema_users_tenants_characters_.py

@@ -0,0 +1,129 @@
+"""initial schema: users, tenants, characters, campaigns
+
+Revision ID: 1b7affd8668e
+Revises: 
+Create Date: 2026-04-13 16:11:02.258931
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '1b7affd8668e'
+down_revision: Union[str, Sequence[str], None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('users',
+    sa.Column('id', sa.Uuid(), nullable=False),
+    sa.Column('sub', sa.String(length=64), nullable=False, comment='Authentik user ID from JWT sub claim'),
+    sa.Column('display_name', sa.String(length=128), nullable=True),
+    sa.Column('email', sa.String(length=255), nullable=True),
+    sa.Column('is_admin', sa.Boolean(), nullable=False, comment='Platform-wide admin (PeterB)'),
+    sa.Column('created_at', sa.DateTime(timezone=True), nullable=False),
+    sa.Column('last_seen_at', sa.DateTime(timezone=True), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_users_sub'), 'users', ['sub'], unique=True)
+    op.create_table('tenants',
+    sa.Column('id', sa.Uuid(), nullable=False),
+    sa.Column('slug', sa.String(length=64), nullable=False, comment="URL-safe identifier (e.g. 'throwback')"),
+    sa.Column('name', sa.String(length=128), nullable=False, comment="Display name (e.g. 'Throwback Champions Campaign')"),
+    sa.Column('description', sa.Text(), nullable=True),
+    sa.Column('owner_id', sa.Uuid(), nullable=False, comment='The user who created/owns this tenant'),
+    sa.Column('is_active', sa.Boolean(), nullable=False),
+    sa.Column('feature_character_editor', sa.Boolean(), nullable=False, comment='When TRUE, enables the from-scratch character builder. Default OFF — HDC import + read-only view only.'),
+    sa.Column('subscription_status', sa.String(length=32), nullable=True),
+    sa.Column('subscription_plan', sa.String(length=32), nullable=True),
+    sa.Column('stripe_customer_id', sa.String(length=64), nullable=True),
+    sa.Column('stripe_subscription_id', sa.String(length=64), nullable=True),
+    sa.Column('hd_license_id', sa.String(length=64), nullable=True, comment='HD license ID bundled with SaaS subscription'),
+    sa.Column('created_at', sa.DateTime(timezone=True), nullable=False),
+    sa.Column('updated_at', sa.DateTime(timezone=True), nullable=True),
+    sa.ForeignKeyConstraint(['owner_id'], ['users.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_tenants_slug'), 'tenants', ['slug'], unique=True)
+    op.create_table('campaigns',
+    sa.Column('id', sa.Uuid(), nullable=False),
+    sa.Column('tenant_id', sa.Uuid(), nullable=False),
+    sa.Column('name', sa.String(length=128), nullable=False),
+    sa.Column('description', sa.Text(), nullable=True),
+    sa.Column('genre', sa.String(length=32), nullable=False, comment='champions | fantasy | star | pulp | modern | western | horror | dark | galactic'),
+    sa.Column('template_name', sa.String(length=64), nullable=False, comment='Default HDT template for characters in this campaign'),
+    sa.Column('gm_user_id', sa.Uuid(), nullable=False, comment='The GM running this campaign'),
+    sa.Column('is_active', sa.Boolean(), nullable=False),
+    sa.Column('created_at', sa.DateTime(timezone=True), nullable=False),
+    sa.Column('updated_at', sa.DateTime(timezone=True), nullable=True),
+    sa.ForeignKeyConstraint(['gm_user_id'], ['users.id'], ),
+    sa.ForeignKeyConstraint(['tenant_id'], ['tenants.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_campaigns_tenant_id'), 'campaigns', ['tenant_id'], unique=False)
+    op.create_table('characters',
+    sa.Column('id', sa.Uuid(), nullable=False),
+    sa.Column('tenant_id', sa.Uuid(), nullable=False),
+    sa.Column('owner_id', sa.Uuid(), nullable=False, comment='The user who imported/created this character'),
+    sa.Column('name', sa.String(length=128), nullable=False),
+    sa.Column('player_name', sa.String(length=128), nullable=True),
+    sa.Column('alternate_identities', sa.String(length=256), nullable=True),
+    sa.Column('template_name', sa.String(length=64), nullable=False, comment='HDT template used for cost calculation'),
+    sa.Column('base_points', sa.Integer(), nullable=False),
+    sa.Column('disad_points', sa.Integer(), nullable=False),
+    sa.Column('experience', sa.Integer(), nullable=False),
+    sa.Column('total_cost', sa.Integer(), nullable=True, comment='Computed total character points spent'),
+    sa.Column('character_data', sa.JSON(), nullable=True, comment='Full character definition from HDC parser'),
+    sa.Column('source', sa.String(length=16), nullable=False, comment='hdc_import | editor | api'),
+    sa.Column('hdc_filename', sa.String(length=256), nullable=True, comment='Original HDC filename if imported'),
+    sa.Column('current_stun', sa.Integer(), nullable=True),
+    sa.Column('current_body', sa.Integer(), nullable=True),
+    sa.Column('current_end', sa.Integer(), nullable=True),
+    sa.Column('is_npc', sa.Boolean(), nullable=False),
+    sa.Column('is_active', sa.Boolean(), nullable=False),
+    sa.Column('created_at', sa.DateTime(timezone=True), nullable=False),
+    sa.Column('updated_at', sa.DateTime(timezone=True), nullable=True),
+    sa.ForeignKeyConstraint(['owner_id'], ['users.id'], ),
+    sa.ForeignKeyConstraint(['tenant_id'], ['tenants.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_characters_owner_id'), 'characters', ['owner_id'], unique=False)
+    op.create_index(op.f('ix_characters_tenant_id'), 'characters', ['tenant_id'], unique=False)
+    op.create_table('tenant_members',
+    sa.Column('id', sa.Uuid(), nullable=False),
+    sa.Column('tenant_id', sa.Uuid(), nullable=False),
+    sa.Column('user_id', sa.Uuid(), nullable=False),
+    sa.Column('role', sa.String(length=16), nullable=False, comment='owner | admin | gm | player'),
+    sa.Column('joined_at', sa.DateTime(timezone=True), nullable=False),
+    sa.ForeignKeyConstraint(['tenant_id'], ['tenants.id'], ondelete='CASCADE'),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('tenant_id', 'user_id', name='uq_tenant_member')
+    )
+    op.create_index(op.f('ix_tenant_members_tenant_id'), 'tenant_members', ['tenant_id'], unique=False)
+    op.create_index(op.f('ix_tenant_members_user_id'), 'tenant_members', ['user_id'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_tenant_members_user_id'), table_name='tenant_members')
+    op.drop_index(op.f('ix_tenant_members_tenant_id'), table_name='tenant_members')
+    op.drop_table('tenant_members')
+    op.drop_index(op.f('ix_characters_tenant_id'), table_name='characters')
+    op.drop_index(op.f('ix_characters_owner_id'), table_name='characters')
+    op.drop_table('characters')
+    op.drop_index(op.f('ix_campaigns_tenant_id'), table_name='campaigns')
+    op.drop_table('campaigns')
+    op.drop_index(op.f('ix_tenants_slug'), table_name='tenants')
+    op.drop_table('tenants')
+    op.drop_index(op.f('ix_users_sub'), table_name='users')
+    op.drop_table('users')
+    # ### end Alembic commands ###

kirby/_migrations/versions/20260424_0001_combat_tables.py

@@ -0,0 +1,197 @@
+"""combat tables
+
+Revision ID: 20260424_0001
+Revises: ba28e71c955d
+Create Date: 2026-04-25
+
+Adds the five combat tables in one atomic migration:
+  combat_template, combat_scene, combat_session, combat_event, combat_session_player.
+
+The plan recommended merging tasks 2 and 3 into a single migration so the
+combat_session.template_id FK is satisfiable on first-up — this is that
+merge.
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import JSONB, UUID
+
+
+# revision identifiers, set by Alembic
+revision = "20260424_0001"
+down_revision = "ba28e71c955d"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ── combat_template (must precede combat_session for FK) ──────────────
+    op.create_table(
+        "combat_template",
+        sa.Column("id", UUID(as_uuid=True), primary_key=True),
+        sa.Column(
+            "tenant_id",
+            UUID(as_uuid=True),
+            sa.ForeignKey("tenants.id", ondelete="CASCADE"),
+            nullable=True,
+        ),
+        sa.Column("name", sa.String(128), nullable=False),
+        sa.Column("edition", sa.String(8), nullable=False, server_default="6E"),
+        sa.Column("mode", sa.String(16), nullable=False, server_default="superheroic"),
+        sa.Column("payload_jsonb", JSONB, nullable=False, server_default="{}"),
+        sa.Column(
+            "created_at", sa.DateTime(timezone=True),
+            nullable=False, server_default=sa.func.now(),
+        ),
+        sa.Column(
+            "updated_at", sa.DateTime(timezone=True),
+            nullable=False, server_default=sa.func.now(),
+        ),
+    )
+    op.create_index(
+        "ix_combat_template_tenant_id", "combat_template", ["tenant_id"],
+    )
+
+    # ── combat_scene ──────────────────────────────────────────────────────
+    op.create_table(
+        "combat_scene",
+        sa.Column("id", UUID(as_uuid=True), primary_key=True),
+        sa.Column(
+            "tenant_id",
+            UUID(as_uuid=True),
+            sa.ForeignKey("tenants.id", ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column("name", sa.String(128), nullable=False),
+        sa.Column("payload_jsonb", JSONB, nullable=False, server_default="{}"),
+        sa.Column(
+            "created_at", sa.DateTime(timezone=True),
+            nullable=False, server_default=sa.func.now(),
+        ),
+        sa.Column(
+            "updated_at", sa.DateTime(timezone=True),
+            nullable=False, server_default=sa.func.now(),
+        ),
+    )
+    op.create_index("ix_combat_scene_tenant_id", "combat_scene", ["tenant_id"])
+
+    # ── combat_session ────────────────────────────────────────────────────
+    op.create_table(
+        "combat_session",
+        sa.Column("id", UUID(as_uuid=True), primary_key=True),
+        sa.Column(
+            "tenant_id",
+            UUID(as_uuid=True),
+            sa.ForeignKey("tenants.id", ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column(
+            "owner_user_id",
+            UUID(as_uuid=True),
+            sa.ForeignKey("users.id"),
+            nullable=False,
+        ),
+        sa.Column(
+            "campaign_id",
+            UUID(as_uuid=True),
+            sa.ForeignKey("campaigns.id"),
+            nullable=True,
+        ),
+        sa.Column("name", sa.String(255), nullable=False),
+        sa.Column("status", sa.String(16), nullable=False, server_default="setup"),
+        sa.Column(
+            "template_id",
+            UUID(as_uuid=True),
+            sa.ForeignKey("combat_template.id"),
+            nullable=False,
+        ),
+        sa.Column(
+            "scene_snapshot_jsonb", JSONB,
+            nullable=False, server_default="{}",
+        ),
+        sa.Column(
+            "combatants_jsonb", JSONB,
+            nullable=False, server_default="{}",
+        ),
+        sa.Column(
+            "timeline_jsonb", JSONB,
+            nullable=False, server_default="{}",
+        ),
+        sa.Column("dice_seed", sa.BigInteger, nullable=True),
+        sa.Column(
+            "dice_roller_kind", sa.String(16),
+            nullable=False, server_default="random",
+        ),
+        sa.Column("last_sequence", sa.Integer, nullable=False, server_default="0"),
+        sa.Column(
+            "created_at", sa.DateTime(timezone=True),
+            nullable=False, server_default=sa.func.now(),
+        ),
+        sa.Column(
+            "updated_at", sa.DateTime(timezone=True),
+            nullable=False, server_default=sa.func.now(),
+        ),
+    )
+    op.create_index("ix_combat_session_tenant_id", "combat_session", ["tenant_id"])
+
+    # ── combat_event ──────────────────────────────────────────────────────
+    op.create_table(
+        "combat_event",
+        sa.Column("id", UUID(as_uuid=True), primary_key=True),
+        sa.Column(
+            "session_id",
+            UUID(as_uuid=True),
+            sa.ForeignKey("combat_session.id", ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column("sequence", sa.Integer, nullable=False),
+        sa.Column("event_type", sa.String(64), nullable=False),
+        sa.Column("author_type", sa.String(16), nullable=False),
+        sa.Column("author_id", sa.String(64), nullable=False),
+        sa.Column("payload_jsonb", JSONB, nullable=False, server_default="{}"),
+        sa.Column(
+            "created_at", sa.DateTime(timezone=True),
+            nullable=False, server_default=sa.func.now(),
+        ),
+        sa.UniqueConstraint(
+            "session_id", "sequence", name="uq_combat_event_session_sequence",
+        ),
+    )
+    op.create_index("ix_combat_event_session_id", "combat_event", ["session_id"])
+
+    # ── combat_session_player ─────────────────────────────────────────────
+    op.create_table(
+        "combat_session_player",
+        sa.Column(
+            "session_id",
+            UUID(as_uuid=True),
+            sa.ForeignKey("combat_session.id", ondelete="CASCADE"),
+            primary_key=True,
+        ),
+        sa.Column(
+            "user_id",
+            UUID(as_uuid=True),
+            sa.ForeignKey("users.id", ondelete="CASCADE"),
+            primary_key=True,
+        ),
+        sa.Column("combatant_id", sa.String(64), nullable=True),
+        sa.Column(
+            "role", sa.String(16), nullable=False, server_default="player",
+            comment="player | observer | guest",
+        ),
+        sa.Column(
+            "joined_at", sa.DateTime(timezone=True),
+            nullable=False, server_default=sa.func.now(),
+        ),
+    )
+
+
+def downgrade() -> None:
+    op.drop_table("combat_session_player")
+    op.drop_index("ix_combat_event_session_id", table_name="combat_event")
+    op.drop_table("combat_event")
+    op.drop_index("ix_combat_session_tenant_id", table_name="combat_session")
+    op.drop_table("combat_session")
+    op.drop_index("ix_combat_scene_tenant_id", table_name="combat_scene")
+    op.drop_table("combat_scene")
+    op.drop_index("ix_combat_template_tenant_id", table_name="combat_template")
+    op.drop_table("combat_template")

kirby/_migrations/versions/20260429_0001_add_combatant_jsonb.py

@@ -0,0 +1,43 @@
+"""add combatant_jsonb column to characters
+
+Revision ID: 20260429_0001
+Revises: 21980c836860
+Create Date: 2026-04-29
+
+Stores a serialized kirby_combat.Combatant snapshot per character so
+session creation can hydrate combat state without re-parsing the HDC.
+
+Populated at HDC import time via EntityService; consumed at session
+create to build combat_session.combatants_jsonb properly. Without this,
+session.combatants_jsonb stores empty placeholder dicts and the action
+endpoints 500 in _rehydrate_session.
+
+Nullable so existing rows (imported before this migration when the
+import route was stubbed) don't block the migration; they simply don't
+participate in combat until re-imported.
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+
+revision = "20260429_0001"
+down_revision = "21980c836860"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "characters",
+        sa.Column(
+            "combatant_jsonb",
+            postgresql.JSONB(astext_type=sa.Text()),
+            nullable=True,
+            comment="Serialized kirby_combat.Combatant — populated at HDC import",
+        ),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("characters", "combatant_jsonb")