From 6e4275a510c457e68aef50afea8495c3f16ea0ba Mon Sep 17 00:00:00 2001 From: Alex Blank Date: Thu, 28 May 2026 20:40:40 +0200 Subject: [PATCH] fix: resolve Alembic multiple heads The terminal_sessions migration and drop_tool_configs migration both pointed to add_tool_definition_manifests as their down_revision, creating two heads. Update drop migration to depend on terminal_sessions instead, restoring a single linear chain. --- .../2026_05_28_drop_tool_configs_and_config_folders.py | 2 +- apps/api/src/services/manifest_compiler.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/api/alembic/versions/2026_05_28_drop_tool_configs_and_config_folders.py b/apps/api/alembic/versions/2026_05_28_drop_tool_configs_and_config_folders.py index 22a0475..b8e18ef 100644 --- a/apps/api/alembic/versions/2026_05_28_drop_tool_configs_and_config_folders.py +++ b/apps/api/alembic/versions/2026_05_28_drop_tool_configs_and_config_folders.py @@ -13,7 +13,7 @@ import sqlalchemy as sa # revision identifiers, used by Alembic. revision: str = "2026_05_28_drop_tool_configs_and_config_folders" -down_revision: Union[str, None] = "2026_05_28_add_tool_definition_manifests" +down_revision: Union[str, None] = "2026_05_28_add_terminal_sessions" branch_labels: Union[str, Sequence[str], None] = None depends_on: Union[str, Sequence[str], None] = None diff --git a/apps/api/src/services/manifest_compiler.py b/apps/api/src/services/manifest_compiler.py index 94f790d..a9ec9bb 100644 --- a/apps/api/src/services/manifest_compiler.py +++ b/apps/api/src/services/manifest_compiler.py @@ -350,9 +350,7 @@ def compute_image_tag(tool_name: str, manifest: dict) -> str: return f"headquarter/{safe_name}-{hash_suffix}:latest" -def merge_with_config( - manifest: dict, profile: dict | None = None -) -> dict: +def merge_with_config(manifest: dict, profile: dict | None = None) -> dict: """Merge ConfigProfile overrides into a manifest. Args: