refactor(agent): move preset soft delete to deleted_at mixin

Author: daryllimyt

alembic/versions/32b7a1f4d9c2_add_agent_preset_archive_timestamp.py

@@ -0,0 +1,69 @@
+"""add agent preset soft delete
+
+Revision ID: 32b7a1f4d9c2
+Revises: 11d479597e08
+Create Date: 2026-06-28 00:00:00.000000
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "32b7a1f4d9c2"
+down_revision: str | None = "11d479597e08"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "agent_preset",
+        sa.Column("deleted_at", sa.TIMESTAMP(timezone=True), nullable=True),
+    )
+    op.drop_constraint(
+        "uq_agent_preset_workspace_slug",
+        "agent_preset",
+        type_="unique",
+    )
+    op.create_index(
+        "uq_agent_preset_workspace_slug_active",
+        "agent_preset",
+        ["workspace_id", "slug"],
+        unique=True,
+        postgresql_where=sa.text("deleted_at IS NULL"),
+    )
+
+
+def downgrade() -> None:
+    bind = op.get_bind()
+    duplicate_slug = bind.execute(
+        sa.text(
+            """
+            SELECT workspace_id, slug
+            FROM agent_preset
+            GROUP BY workspace_id, slug
+            HAVING count(*) > 1
+            LIMIT 1
+            """
+        )
+    ).first()
+    if duplicate_slug is not None:
+        raise NotImplementedError(
+            "Cannot downgrade after soft-deleted preset slug reuse because duplicate "
+            "agent_preset rows would violate uq_agent_preset_workspace_slug."
+        )
+
+    op.drop_index(
+        "uq_agent_preset_workspace_slug_active",
+        table_name="agent_preset",
+    )
+    op.create_unique_constraint(
+        "uq_agent_preset_workspace_slug",
+        "agent_preset",
+        ["workspace_id", "slug"],
+    )
+    op.drop_column("agent_preset", "deleted_at")

alembic/versions/32b7a1f4d9c2_add_agent_preset_soft_delete.py

@@ -113,7 +113,8 @@ async def test_start_slack_oauth_returns_404_for_missing_token() -> None:
 
 
 @pytest.mark.anyio
-async def test_start_slack_oauth_returns_404_for_archived_existing_token() -> None:
+async def test_start_slack_oauth_returns_404_for_soft_deleted_existing_token() -> None:
+    """Slack OAuth updates reject tokens whose preset is soft-deleted."""
     role = Role(
         type="service",
         service_id="tracecat-api",
@@ -168,7 +169,10 @@ async def test_start_slack_oauth_returns_404_for_archived_existing_token() -> No
 
 
 @pytest.mark.anyio
-async def test_slack_oauth_callback_rejects_archived_preset_before_exchange() -> None:
+async def test_slack_oauth_callback_rejects_soft_deleted_preset_before_exchange() -> (
+    None
+):
+    """Slack OAuth callbacks stop before token exchange for soft-deleted presets."""
     token_id = uuid.uuid4()
     workspace_id = uuid.uuid4()
     preset_id = uuid.uuid4()
@@ -258,7 +262,8 @@ def parse_stored_channel_config(self, *args, **kwargs):
 
 
 @pytest.mark.anyio
-async def test_update_channel_token_returns_404_for_archived_preset() -> None:
+async def test_update_channel_token_returns_404_for_soft_deleted_preset() -> None:
+    """Channel token updates surface soft-deleted presets as not found."""
     role = Role(
         type="service",
         service_id="tracecat-api",

tests/unit/test_agent_channel_management_router.py

@@ -180,11 +180,12 @@ async def test_update_token_rejects_null_is_active(
 
 
 @pytest.mark.anyio
-async def test_create_token_rejects_archived_preset(
+async def test_create_token_rejects_soft_deleted_preset(
     agent_channel_service: AgentChannelService,
     agent_preset: AgentPreset,
 ) -> None:
-    agent_preset.archived_at = datetime.now(UTC)
+    """Channel tokens cannot be created for soft-deleted presets."""
+    agent_preset.deleted_at = datetime.now(UTC)
     agent_channel_service.session.add(agent_preset)
     await agent_channel_service.session.commit()
 
@@ -210,6 +211,7 @@ async def test_create_active_token_locks_preset(
     agent_preset: AgentPreset,
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
+    """Creating an active token locks the preset before insertion."""
     captured_locks: list[bool] = []
     original_require_workspace_preset = agent_channel_service._require_workspace_preset
 
@@ -248,6 +250,7 @@ async def test_create_pending_token_locks_preset(
     agent_preset: AgentPreset,
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
+    """Creating a pending Slack token locks the preset before insertion."""
     captured_locks: list[bool] = []
     original_require_workspace_preset = agent_channel_service._require_workspace_preset
 
@@ -281,10 +284,11 @@ async def instrumented_require_workspace_preset(
 
 
 @pytest.mark.anyio
-async def test_update_token_rejects_reactivating_archived_preset(
+async def test_update_token_rejects_reactivating_soft_deleted_preset(
     agent_channel_service: AgentChannelService,
     agent_preset: AgentPreset,
 ) -> None:
+    """Soft-deleted presets cannot have inactive tokens reactivated."""
     token = await agent_channel_service.create_token(
         AgentChannelTokenCreate(
             agent_preset_id=agent_preset.id,
@@ -298,7 +302,7 @@ async def test_update_token_rejects_reactivating_archived_preset(
             is_active=False,
         )
     )
-    agent_preset.archived_at = datetime.now(UTC)
+    agent_preset.deleted_at = datetime.now(UTC)
     agent_channel_service.session.add(agent_preset)
     await agent_channel_service.session.commit()
 
@@ -310,10 +314,11 @@ async def test_update_token_rejects_reactivating_archived_preset(
 
 
 @pytest.mark.anyio
-async def test_update_token_rejects_config_update_for_archived_preset(
+async def test_update_token_rejects_config_update_for_soft_deleted_preset(
     agent_channel_service: AgentChannelService,
     agent_preset: AgentPreset,
 ) -> None:
+    """Soft-deleted presets cannot receive channel config updates."""
     token = await agent_channel_service.create_token(
         AgentChannelTokenCreate(
             agent_preset_id=agent_preset.id,
@@ -327,7 +332,7 @@ async def test_update_token_rejects_config_update_for_archived_preset(
             is_active=False,
         )
     )
-    agent_preset.archived_at = datetime.now(UTC)
+    agent_preset.deleted_at = datetime.now(UTC)
     agent_channel_service.session.add(agent_preset)
     await agent_channel_service.session.commit()
 
@@ -352,6 +357,7 @@ async def test_update_token_locks_preset_when_reactivating(
     agent_preset: AgentPreset,
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
+    """Reactivating a token locks the preset before mutation."""
     token = await agent_channel_service.create_token(
         AgentChannelTokenCreate(
             agent_preset_id=agent_preset.id,
@@ -389,10 +395,11 @@ async def instrumented_require_workspace_preset(
 
 
 @pytest.mark.anyio
-async def test_public_token_lookup_rejects_archived_preset(
+async def test_public_token_lookup_rejects_soft_deleted_preset(
     agent_channel_service: AgentChannelService,
     agent_preset: AgentPreset,
 ) -> None:
+    """Public token lookup ignores tokens attached to soft-deleted presets."""
     token = await agent_channel_service.create_token(
         AgentChannelTokenCreate(
             agent_preset_id=agent_preset.id,
@@ -406,7 +413,7 @@ async def test_public_token_lookup_rejects_archived_preset(
             is_active=True,
         )
     )
-    agent_preset.archived_at = datetime.now(UTC)
+    agent_preset.deleted_at = datetime.now(UTC)
     agent_channel_service.session.add(agent_preset)
     await agent_channel_service.session.commit()
 

tests/unit/test_agent_channel_service.py

@@ -254,22 +254,22 @@ async def test_move_preset_requires_agent_addons_entitlement(
 
 
 @pytest.mark.anyio
-async def test_move_preset_rejects_archived_preset(
+async def test_move_preset_rejects_soft_deleted_preset(
     folder_service: AgentFolderService,
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    """Archived presets should not be movable through folder management."""
+    """Soft-deleted presets should not be movable through folder management."""
     monkeypatch.setattr(folder_service, "has_entitlement", AsyncMock(return_value=True))
     target = await folder_service.create_folder(name="target", parent_path="/")
     preset = AgentPreset(
         workspace_id=folder_service.workspace_id,
-        name="Archived preset",
-        slug="archived-preset",
+        name="Soft-deleted preset",
+        slug="soft-deleted-preset",
         model_name="gpt-4o-mini",
         model_provider="openai",
         retries=3,
         enable_internet_access=False,
-        archived_at=datetime.now(UTC),
+        deleted_at=datetime.now(UTC),
     )
     folder_service.session.add(preset)
     await folder_service.session.commit()
@@ -348,14 +348,14 @@ async def test_get_directory_items_returns_real_direct_item_counts(
             ),
             AgentPreset(
                 workspace_id=folder_service.workspace_id,
-                name="archived",
-                slug="archived",
+                name="soft deleted",
+                slug="soft-deleted",
                 model_name="gpt-4o-mini",
                 model_provider="openai",
                 retries=3,
                 enable_internet_access=False,
                 folder_id=parent.id,
-                archived_at=datetime.now(UTC),
+                deleted_at=datetime.now(UTC),
             ),
         ]
     )